diff --git a/src/smartplaylists/querysortpage.ui b/src/smartplaylists/querysortpage.ui
index 8ae19981d..4758b8104 100644
--- a/src/smartplaylists/querysortpage.ui
+++ b/src/smartplaylists/querysortpage.ui
@@ -14,7 +14,16 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -82,6 +91,12 @@
       </item>
       <item row="1" column="1">
        <widget class="QSpinBox" name="limit_value">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="suffix">
          <string> songs</string>
         </property>
diff --git a/src/smartplaylists/wizard.cpp b/src/smartplaylists/wizard.cpp
index deba5d19d..ab327a885 100644
--- a/src/smartplaylists/wizard.cpp
+++ b/src/smartplaylists/wizard.cpp
@@ -106,6 +106,9 @@ void Wizard::SetGenerator(GeneratorPtr gen) {
   // Set the name
   finish_page_->ui_->name->setText(gen->name());
   finish_page_->ui_->dynamic->setChecked(gen->is_dynamic());
+  if (!gen->name().isEmpty()) {
+    setWindowTitle(windowTitle() + " - " + gen->name());
+  }
 
   if (type_index_ == -1) {
     qLog(Error) << "Plugin was not found for generator type" << gen->type();