diff --git a/ChangeLog b/ChangeLog
index 202589e9..ada4cc56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
    Avoid setting line number margin twice when creating new tabs, also
    don't call gtk_notebook_set_current_page() explicitly as it isn't
    necessary.
+ * geany.glade, src/interface.c:
+   Make the notebook tabs in the messages window scrollable.
 
 
 2008-04-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/geany.glade b/geany.glade
index 07d30de8..c422c87c 100644
--- a/geany.glade
+++ b/geany.glade
@@ -2217,7 +2217,7 @@
 		      <property name="show_tabs">True</property>
 		      <property name="show_border">True</property>
 		      <property name="tab_pos">GTK_POS_LEFT</property>
-		      <property name="scrollable">False</property>
+		      <property name="scrollable">True</property>
 		      <property name="enable_popup">False</property>
 
 		      <child>
diff --git a/src/interface.c b/src/interface.c
index 283b61ef..c95e5f93 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -1260,6 +1260,7 @@ create_window1 (void)
   gtk_widget_show (notebook_info);
   gtk_container_add (GTK_CONTAINER (viewport1), notebook_info);
   gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook_info), GTK_POS_LEFT);
+  gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook_info), TRUE);
 
   scrolledwindow4 = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_show (scrolledwindow4);