diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index dbc63c3d9..af70ad26a 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -72,6 +72,9 @@ SettingsDialog::SettingsDialog( QWidget *parent )
     ui->setupUi( this );
     TomahawkSettings* s = TomahawkSettings::instance();
 
+    TomahawkUtils::unmarginLayout( layout() );
+    ui->stackedWidget->setContentsMargins( 4, 4, 4, 0 );
+
     ui->addSipButton->setFixedWidth( 42 );
     ui->removeSipButton->setFixedWidth( ui->addSipButton->width() );
     ui->addScript->setFixedWidth( 42 );
@@ -88,7 +91,8 @@ SettingsDialog::SettingsDialog( QWidget *parent )
     ui->listWidget->setFrameShadow( QFrame::Sunken );
     setContentsMargins( 4, 4, 4, 4 );
 #else
-    ui->verticalLayout->removeItem( ui->verticalSpacer_3 );
+    ui->listWidget->setFixedWidth( 83 );
+    setContentsMargins( 0, 4, 4, 4 );
 #endif
 
 #ifdef Q_WS_MAC
diff --git a/src/stackedsettingsdialog.ui b/src/stackedsettingsdialog.ui
index d512775dd..5b5fc84c2 100644
--- a/src/stackedsettingsdialog.ui
+++ b/src/stackedsettingsdialog.ui
@@ -14,8 +14,8 @@
    <string>Tomahawk Settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_12">
-   <property name="bottomMargin">
-    <number>4</number>
+   <property name="margin">
+    <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">