diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index d4ad53be75..75e5c9d8c2 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -8,10 +8,6 @@
 
 Format 41
 
-# Beamer does not work with enumitem.
-# See bug #7047.
-ExcludesModule enumitem
-
 #
 # GLOBAL SETTINGS
 #
@@ -20,6 +16,10 @@ ExcludesModule enumitem
 Input stdcounters.inc
 Input stdinsets.inc
 
+# Beamer does not work with enumitem.
+# See bug #7047.
+ExcludesModule enumitem
+
 # General textclass parameters
 Columns            1
 Sides              1
@@ -811,6 +811,7 @@ Style Block
   Margin           Dynamic
   LatexType        Environment
   NextNoIndent     1
+  KeepEmpty        1
   Align            Left
   LabelType        Static
   LabelSep         xx