diff --git a/src/ui/qgsexpressionselectiondialogbase.ui b/src/ui/qgsexpressionselectiondialogbase.ui
index f640c60e0de..18a27c1f4e8 100644
--- a/src/ui/qgsexpressionselectiondialogbase.ui
+++ b/src/ui/qgsexpressionselectiondialogbase.ui
@@ -26,21 +26,21 @@
    <property name="bottomMargin">
     <number>3</number>
    </property>
-   <item row="1" column="4">
+   <item row="1" column="5">
     <widget class="QPushButton" name="mPbnClose">
      <property name="text">
-      <string>Close</string>
+      <string>&amp;Close</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="1" column="2">
     <widget class="QToolButton" name="mButtonZoomToFeatures">
      <property name="text">
       <string>Zoom to features</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="1" column="1">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -53,10 +53,7 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="0" colspan="5">
-    <widget class="QgsExpressionBuilderWidget" name="mExpressionBuilder" native="true"/>
-   </item>
-   <item row="1" column="2">
+   <item row="1" column="3">
     <widget class="QToolButton" name="mButtonSelect">
      <property name="text">
       <string>…</string>
@@ -69,13 +66,16 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
+   <item row="1" column="0">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
+      <set>QDialogButtonBox::Help</set>
      </property>
     </widget>
    </item>
+   <item row="0" column="0" colspan="6">
+    <widget class="QgsExpressionBuilderWidget" name="mExpressionBuilder" native="true"/>
+   </item>
   </layout>
   <action name="mActionSelect">
    <property name="text">