diff --git a/src/include/bootloader/grub/options.rb b/src/include/bootloader/grub/options.rb
index 1621340ff..033437bae 100644
--- a/src/include/bootloader/grub/options.rb
+++ b/src/include/bootloader/grub/options.rb
@@ -733,6 +733,7 @@ def HelpBootLoaderLocationWidget
 
     def grubBootLoaderLocationWidget
       contents = VBox(
+        VSpacing(1),
         Frame(
           _("Boot Loader Location"),
           VBox(
@@ -742,35 +743,22 @@ def grubBootLoaderLocationWidget
                 Left(
                   CheckBox(Id("boot_mbr"), _("Boot from &Master Boot Record"))
                 ),
-                Left(CheckBox(Id("boot_root"), _("Boot from &Root Partition"))),
-                Left(CheckBox(Id("boot_boot"), _("Boo&t from Boot Partition"))),
-                Left(
-                  CheckBox(
-                    Id("boot_extended"),
-                    _("Boot from &Extended Partition")
-                  )
-                ),
-                Left(
-                  CheckBox(
-                    Id("boot_custom"),
-                    Opt(:notify),
-                    _("C&ustom Boot Partition")
-                  )
-                ),
-                Left(
-                  ComboBox(
-                    Id("boot_custom_list"),
-                    Opt(:editable, :hstretch),
-                    "",
-                    []
-                  )
-                ),
-                VStretch()
+                BootStorage.BootPartitionDevice == BootStorage.RootPartitionDevice ?
+                  Left(CheckBox(Id("boot_root"), _("Boot from &Root Partition"))) :
+                  Left(CheckBox(Id("boot_boot"), _("Boo&t from Boot Partition"))),
+                BootStorage.ExtendedPartitionDevice ?
+                  Left(
+                    CheckBox(
+                      Id("boot_extended"),
+                      _("Boot from &Extended Partition")
+                    )
+                  ) :
+                  Empty()
               )
             )
           )
         ),
-        VStretch()
+        VSpacing(1)
       )
 
       if !BootCommon.PartitionInstallable
diff --git a/src/include/bootloader/grub2/dialogs.rb b/src/include/bootloader/grub2/dialogs.rb
index fdf831919..7db652b41 100644
--- a/src/include/bootloader/grub2/dialogs.rb
+++ b/src/include/bootloader/grub2/dialogs.rb
@@ -52,8 +52,9 @@ def boot_code_tab
         # if name is not included, that it is not displayed
         "widget_names" => widget_names,
         "contents"     => VBox(
-          VSpacing(1),
-          HBox( "loader_type", "loader_location"),
+          VSquash(HBox(
+            Top(VBox( VSpacing(1), "loader_type")),
+            "loader_location")),
           MarginBox(1, 0.5, "distributor"),
           MarginBox(1, 0.5, Left("activate")),
           MarginBox(1, 0.5, Left("generic_mbr")),