diff --git a/src/libtomahawk/ExternalResolverGui.cpp b/src/libtomahawk/ExternalResolverGui.cpp
index 1204a0c29..7987e4d12 100644
--- a/src/libtomahawk/ExternalResolverGui.cpp
+++ b/src/libtomahawk/ExternalResolverGui.cpp
@@ -90,6 +90,11 @@ Tomahawk::ExternalResolverGui::widgetFromData( QByteArray& data, QWidget* parent
     QUiLoader l;
     QBuffer b( &data );
     QWidget* w = l.load( &b, parent );
+#ifdef Q_OS_MAC
+    w->setContentsMargins( 8, 8, 8, 8 );
+#else
+    w->setContentsMargins( 6, 6, 6, 6 );
+#endif
 
     return w;
 }
diff --git a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
index 1b404da19..96850610d 100644
--- a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
+++ b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
@@ -56,6 +56,9 @@ DelegateConfigWrapper::DelegateConfigWrapper( QWidget* conf, QWidget* aboutWidge
     h->addWidget( m_buttons );
     if( m_widget && m_widget->layout() )
         h->setContentsMargins( m_widget->layout()->contentsMargins() );
+    else if( m_widget )
+        h->setContentsMargins( m_widget->contentsMargins() );
+
     v->addLayout( h );
 
     setLayout( v );