diff --git a/deluge/ui/gtkui/glade/main_window.tabs.ui b/deluge/ui/gtkui/glade/main_window.tabs.ui
index 5451340bb..17f144fd7 100644
--- a/deluge/ui/gtkui/glade/main_window.tabs.ui
+++ b/deluge/ui/gtkui/glade/main_window.tabs.ui
@@ -49,7 +49,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <object class="GtkViewport" id="viewport1">
                 <property name="visible">True</property>
@@ -61,7 +61,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="top_padding">5</property>
-                    <property name="bottom_padding">10</property>
+                    <property name="bottom_padding">2</property>
                     <property name="left_padding">10</property>
                     <property name="right_padding">10</property>
                     <child>
@@ -671,8 +671,8 @@
                     <property name="can_focus">False</property>
                     <property name="yalign">0</property>
                     <property name="yscale">0</property>
-                    <property name="top_padding">10</property>
-                    <property name="bottom_padding">10</property>
+                    <property name="top_padding">5</property>
+                    <property name="bottom_padding">2</property>
                     <property name="left_padding">10</property>
                     <property name="right_padding">15</property>
                     <child>
@@ -1199,8 +1199,8 @@
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="top_padding">10</property>
-                    <property name="bottom_padding">10</property>
+                    <property name="top_padding">5</property>
+                    <property name="bottom_padding">2</property>
                     <property name="left_padding">5</property>
                     <property name="right_padding">15</property>
                     <child>
@@ -1732,8 +1732,8 @@
                   <object class="GtkAlignment" id="alignment6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="top_padding">10</property>
-                    <property name="bottom_padding">10</property>
+                    <property name="top_padding">5</property>
+                    <property name="bottom_padding">2</property>
                     <property name="left_padding">10</property>
                     <property name="right_padding">15</property>
                     <child>
diff --git a/deluge/ui/gtkui/glade/main_window.ui b/deluge/ui/gtkui/glade/main_window.ui
index 53ea8079a..7fc990e74 100644
--- a/deluge/ui/gtkui/glade/main_window.ui
+++ b/deluge/ui/gtkui/glade/main_window.ui
@@ -757,6 +757,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                     <property name="can_focus">False</property>
                     <property name="tab_pos">left</property>
                     <property name="show_border">False</property>
+                    <property name="scrollable">True</property>
                     <property name="tab_hborder">8</property>
                     <property name="tab_vborder">1</property>
                   </object>
diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index 6065d5d43..5fb0f3185 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -90,7 +90,7 @@ DEFAULT_PREFS = {
     "window_height": 480,
     "pref_dialog_width": None,
     "pref_dialog_height": None,
-    "window_pane_position": -1,
+    "window_pane_position": 235,
     "tray_download_speed_list": [5.0, 10.0, 30.0, 80.0, 300.0],
     "tray_upload_speed_list": [5.0, 10.0, 30.0, 80.0, 300.0],
     "connection_limit_list": [50, 100, 200, 300, 500],
diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index 201d33efe..e86f77958 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -106,8 +106,8 @@ class MainWindow(component.Component):
         self.window = self.main_builder.get_object("main_window")
 
         self.window.set_icon(deluge.ui.gtkui.common.get_deluge_icon())
-
         self.vpaned = self.main_builder.get_object("vpaned")
+
         self.initial_vpaned_position = self.config["window_pane_position"]
 
         # Load the window state
@@ -141,10 +141,10 @@ class MainWindow(component.Component):
                 self.window.get_property("visible"):
             log.debug("Showing window")
             self.main_builder.prev_connect_signals(self.gtk_builder_signals_holder)
+            self.vpaned.set_position(self.initial_vpaned_position)
             self.show()
             while gtk.events_pending():
                 gtk.main_iteration(False)
-            self.vpaned.set_position(self.initial_vpaned_position)
 
     def show(self):
         try: