diff --git a/src/smartplaylists/querysearchpage.ui b/src/smartplaylists/querysearchpage.ui
index 3495855fa..2e26b6310 100644
--- a/src/smartplaylists/querysearchpage.ui
+++ b/src/smartplaylists/querysearchpage.ui
@@ -25,16 +25,7 @@
 }</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,5,1">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
@@ -102,7 +93,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>420</width>
+           <width>418</width>
            <height>182</height>
           </rect>
          </property>
@@ -113,16 +104,7 @@
           </sizepolicy>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
diff --git a/src/smartplaylists/querywizardplugin.cpp b/src/smartplaylists/querywizardplugin.cpp
index 7c365029f..fa66bf03e 100644
--- a/src/smartplaylists/querywizardplugin.cpp
+++ b/src/smartplaylists/querywizardplugin.cpp
@@ -152,24 +152,6 @@ int QueryWizardPlugin::CreatePages(QWizard* wizard, int finish_page_id) {
           SLOT(UpdateSortPreview()));
   connect(sort_ui_->random, SIGNAL(toggled(bool)), SLOT(UpdateSortPreview()));
 
-  // Adjust height, if necessary
-  /*
-  QScreen *scn = QGuiApplication::primaryScreen();
-  QRect scnGeo = scn->availableGeometry();
-  const int scnHeight = scnGeo.height();
-  //QRect pgeGeo = search_page_->geometry();
-  const int pgeHeight = search_page_->height();
-  printf("djm: pgeHeight=%d, scnHeight=%d\n", pgeHeight, scnHeight);
-  if (pgeHeight > scnHeight) {
-     printf("djm: too tall\n");
-     const int pgeWidth = search_page_->width();
-     search_page_->resize(pgeWidth, scnHeight);
-  }
-  else {
-     printf("djm: OK tall\n");
-  }
-  */
-
   // Configure the page text
   search_page_->setTitle(tr("Search terms"));
   search_page_->setSubTitle(