diff --git a/src/tomahawk/SettingsDialog.cpp b/src/tomahawk/SettingsDialog.cpp
index f99fd3290..65be5605a 100644
--- a/src/tomahawk/SettingsDialog.cpp
+++ b/src/tomahawk/SettingsDialog.cpp
@@ -262,6 +262,11 @@ SettingsDialog::SettingsDialog(QObject *parent )
 
     connect( m_dialog, SIGNAL( accepted() ), SLOT( saveSettings() ) );
     connect( m_dialog, SIGNAL( rejected() ), SLOT( onRejected() ) );
+
+#ifdef Q_OS_MAC
+    if ( m_advancedWidgetUi->staticHostName->isEnabled() )
+        m_advancedWidgetUi->remoteConnectionsGroupBox->setFocus();
+#endif
 }
 
 
@@ -395,6 +400,11 @@ SettingsDialog::toggleRemoteMode()
     m_advancedWidgetUi->staticPort->setEnabled( m_advancedWidgetUi->staticIpRadioButton->isChecked() );
     m_advancedWidgetUi->staticHostNameLabel->setEnabled( m_advancedWidgetUi->staticIpRadioButton->isChecked() );
     m_advancedWidgetUi->staticPortLabel->setEnabled( m_advancedWidgetUi->staticIpRadioButton->isChecked() );
+
+#ifdef Q_OS_MAC
+    if ( m_advancedWidgetUi->staticHostName->isEnabled() )
+        m_advancedWidgetUi->remoteConnectionsGroupBox->setFocus();
+#endif
 }