diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index 0e1bac5c0..78f9fb569 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -184,6 +184,20 @@ TomahawkSettings::setMainWindowState( const QByteArray& state )
 }
 
 
+QByteArray
+TomahawkSettings::mainWindowSplitterState() const
+{
+    return value( "ui/mainwindow/splitterState" ).toByteArray();
+}
+
+
+void
+TomahawkSettings::setMainWindowSplitterState( const QByteArray& state )
+{
+    setValue( "ui/mainwindow/splitterState", state );
+}
+
+
 QByteArray
 TomahawkSettings::playlistColumnSizes( const QString& playlistid ) const
 {
diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h
index 4c1e64139..5f7946df6 100644
--- a/src/libtomahawk/tomahawksettings.h
+++ b/src/libtomahawk/tomahawksettings.h
@@ -34,6 +34,9 @@ public:
     QByteArray mainWindowState() const;
     void setMainWindowState( const QByteArray& state );
 
+    QByteArray mainWindowSplitterState() const;
+    void setMainWindowSplitterState( const QByteArray& state );
+
     /// Playlist stuff
     QByteArray playlistColumnSizes( const QString& playlistid ) const;
     void setPlaylistColumnSizes( const QString& playlistid, const QByteArray& state );
diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp
index 619a4d672..b079e606a 100644
--- a/src/sourcetree/sourcetreeview.cpp
+++ b/src/sourcetree/sourcetreeview.cpp
@@ -46,6 +46,7 @@ SourceTreeView::SourceTreeView( QWidget* parent )
     setFrameShape( QFrame::NoFrame );
     setAttribute( Qt::WA_MacShowFocusRect, 0 );
     setContentsMargins( 0, 0, 0, 0 );
+    setMinimumWidth( 220 );
 
     setHeaderHidden( true );
     setRootIsDecorated( false );
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index 7a6a227bd..31eaf27ca 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -144,6 +144,8 @@ TomahawkWindow::loadSettings()
         restoreGeometry( s->mainWindowGeometry() );
     if ( !s->mainWindowState().isEmpty() )
         restoreState( s->mainWindowState() );
+    if ( !s->mainWindowSplitterState().isEmpty() )
+        ui->splitter->restoreState( s->mainWindowSplitterState() );
 }
 
 
@@ -153,6 +155,7 @@ TomahawkWindow::saveSettings()
     TomahawkSettings* s = TomahawkSettings::instance();
     s->setMainWindowGeometry( saveGeometry() );
     s->setMainWindowState( saveState() );
+    s->setMainWindowSplitterState( ui->splitter->saveState() );
 }