=== modified file 'data/ui/main.ui'
--- data/ui/main.ui	2010-02-22 16:32:23 +0000
+++ data/ui/main.ui	2010-03-05 00:02:54 +0000
@@ -299,6 +299,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="position">129</property>
+            <signal name="button_press_event" handler="on_splitter_button_press_event"/>
             <child>
               <object class="GtkVBox" id="vbox6">
                 <property name="visible">True</property>

=== modified file 'xlgui/main.py'
--- xlgui/main.py	2010-02-24 10:09:49 +0000
+++ xlgui/main.py	2010-03-05 00:04:57 +0000
@@ -728,6 +728,7 @@
             'on_configure_event':   self.configure_event,
             'on_window_state_event': self.window_state_change_event,
             'on_delete_event':      self.delete_event,
+            'on_splitter_button_press_event': self.on_splitter_button_press_event,
             'on_quit_item_activated': self.quit,
             'on_play_button_clicked': self.on_play_clicked,
             'on_next_button_clicked':
@@ -952,6 +953,15 @@
         if event.type == gtk.gdk.BUTTON_PRESS and event.button == 2:
             self.add_playlist()
 
+    def on_splitter_button_press_event(self, splitter, event):
+        """
+            Hides or shows the panes
+        """
+        # FIXME: make gtk.gdk._2BUTTON_PRESS work instead
+        if event.button == 2:
+            value = settings.get_option('gui/mainw_panes_visible', True)
+            settings.set_option('gui/mainw_panes_visible', not value)
+
     def on_search_collection_focus(self, *e):
         """
             Gives focus to the collection search bar
@@ -1146,6 +1156,13 @@
         if option == 'player/volume':
             self.volume_slider.set_value(settings.get_option(option, 1))
 
+        if option == 'gui/mainw_panes_visible':
+            panes_visible = settings.get_option(option, True)
+            position = 0
+            if panes_visible:
+                position = settings.get_option('gui/mainw_sash_pos', 200)
+            self.splitter.set_position(position)
+
         if option == 'gui/show_tabbar':
             self.playlist_notebook.set_show_tabs(
                 settings.get_option(option, True)
@@ -1330,6 +1347,10 @@
         self.window.resize(width, height)
 
         pos = settings.get_option('gui/mainw_sash_pos', 200)
+
+        if not settings.get_option('gui/mainw_panes_visible', True):
+            pos = 0
+
         self.splitter.set_position(pos)
 
     def delete_event(self, *e):
@@ -1367,10 +1388,14 @@
         """
             Called when the window is resized or moved
         """
-        pos = self.splitter.get_position()
-        if pos > 10 and pos != settings.get_option(
-                "gui/mainw_sash_pos", -1):
-            settings.set_option('gui/mainw_sash_pos', pos)
+        position = self.splitter.get_position()
+        if position > 0:
+            settings.set_option('gui/mainw_panes_visible', True)
+            savedposition = settings.get_option('gui/mainw_sash_pos', 200)
+            if position > 10 and position != savedposition:
+                settings.set_option('gui/mainw_sash_pos', position)
+        else:
+            settings.set_option('gui/mainw_panes_visible', False)
 
         # Don't save window size if it is maximized or fullscreen.
         if settings.get_option('gui/mainw_maximized', False) or \