diff --git a/src/Mod/Part/Gui/DlgFilletEdges.h b/src/Mod/Part/Gui/DlgFilletEdges.h
index bba6d7a43..f3afa03b2 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.h
+++ b/src/Mod/Part/Gui/DlgFilletEdges.h
@@ -157,6 +157,8 @@ public:
 
     virtual QDialogButtonBox::StandardButtons getStandardButtons() const
     { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
+    virtual bool needsFullSpace() const
+    { return true; }
 
 private:
     DlgFilletEdges* widget;
@@ -179,6 +181,8 @@ public:
 
     virtual QDialogButtonBox::StandardButtons getStandardButtons() const
     { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
+    virtual bool needsFullSpace() const
+    { return true; }
 
 private:
     DlgChamferEdges* widget;
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.ui b/src/Mod/Part/Gui/DlgFilletEdges.ui
index 7e4a5966b..b2b3d8742 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.ui
+++ b/src/Mod/Part/Gui/DlgFilletEdges.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>424</width>
-    <height>426</height>
+    <width>290</width>
+    <height>441</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Fillet Edges</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
+  <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -50,12 +50,58 @@
      <property name="title">
       <string>Fillet Parameter</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="5">
-       <widget class="QPushButton" name="selectNoneButton">
-        <property name="text">
-         <string>None</string>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0" colspan="2">
+       <widget class="QGroupBox" name="groupBox_3">
+        <property name="title">
+         <string>Selection</string>
         </property>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0" colspan="2">
+          <widget class="QRadioButton" name="selectEdges">
+           <property name="text">
+            <string>Select edges</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2" colspan="2">
+          <widget class="QRadioButton" name="selectFaces">
+           <property name="text">
+            <string>Select faces</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QPushButton" name="selectAllButton">
+           <property name="text">
+            <string>All</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1" colspan="2">
+          <widget class="QPushButton" name="selectNoneButton">
+           <property name="text">
+            <string>None</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>221</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
        </widget>
       </item>
       <item row="1" column="0">
@@ -65,7 +111,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="4" colspan="2">
+      <item row="1" column="1">
        <widget class="QComboBox" name="filletType">
         <item>
          <property name="text">
@@ -79,10 +125,10 @@
         </item>
        </widget>
       </item>
-      <item row="2" column="0" colspan="6">
+      <item row="2" column="0" colspan="2">
        <widget class="QTreeView" name="treeView"/>
       </item>
-      <item row="3" column="0" colspan="6">
+      <item row="3" column="0" colspan="2">
        <layout class="QHBoxLayout">
         <property name="spacing">
          <number>6</number>
@@ -141,43 +187,6 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="4">
-       <widget class="QPushButton" name="selectAllButton">
-        <property name="text">
-         <string>All</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QRadioButton" name="selectFaces">
-        <property name="text">
-         <string>Select faces</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>221</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="selectEdges">
-        <property name="text">
-         <string>Select edges</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>