diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 1707489ed..a42d90f9b 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -113,7 +113,10 @@ SettingsDialog::SettingsDialog( QWidget *parent )
     {
         m_sipSpinner = new LoadingSpinner( ui->accountsView );
         m_sipSpinner->fadeIn();
-        connect( Servent::instance(), SIGNAL( ready() ),m_sipSpinner, SLOT( fadeOut() ) );
+
+        ui->addSipButton->setEnabled( false );
+        ui->removeSipButton->setEnabled( false );
+        connect( Servent::instance(), SIGNAL( ready() ), this, SLOT( serventReady() ) );
     }
 
     setupSipButtons();
@@ -237,6 +240,13 @@ SettingsDialog::~SettingsDialog()
     delete ui;
 }
 
+void
+SettingsDialog::serventReady()
+{
+    m_sipSpinner->fadeOut();
+    ui->addSipButton->setEnabled( true );
+    ui->removeSipButton->setEnabled( true );
+}
 
 void
 SettingsDialog::createIcons()
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index 471ee685d..fea8f5592 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -101,6 +101,7 @@ private slots:
     void sipCreateConfigClosed( int value );
 
     void changePage( QListWidgetItem*, QListWidgetItem* );
+    void serventReady();
 
 private:
     void createIcons();
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index 2eb4f5418..aac45bdc1 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -347,12 +347,6 @@ TomahawkWindow::setupSignals()
     ui->menuWindow->menuAction()->setVisible( false );
 #endif
 
-    if ( !Servent::instance()->isReady() )
-    {
-        ui->actionPreferences->setEnabled( false );
-        connect( Servent::instance(), SIGNAL( ready() ), this, SLOT( enablePreferences() ) );
-    }
-
     // <SipHandler>
     connect( SipHandler::instance(), SIGNAL( connected( SipPlugin* ) ), SLOT( onSipConnected() ) );
     connect( SipHandler::instance(), SIGNAL( disconnected( SipPlugin* ) ), SLOT( onSipDisconnected() ) );
@@ -711,12 +705,6 @@ TomahawkWindow::checkForUpdates()
 #endif
 }
 
-void
-TomahawkWindow::enablePreferences()
-{
-    ui->actionPreferences->setEnabled( true );
-}
-
 
 void
 TomahawkWindow::onSearch( const QString& search )
diff --git a/src/tomahawkwindow.h b/src/tomahawkwindow.h
index 27559f77d..988d66899 100644
--- a/src/tomahawkwindow.h
+++ b/src/tomahawkwindow.h
@@ -89,7 +89,6 @@ private slots:
 
     void showAboutTomahawk();
     void checkForUpdates();
-    void enablePreferences();
 
     void onSipPluginAdded( SipPlugin* p );
     void onSipPluginRemoved( SipPlugin* p );