diff --git a/ChangeLog b/ChangeLog
index 4394222755..cabd1f8502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (gtk_text_view_get_border_window_size): Don't
+	fall thru to the wrong window types.  (#323843)
+
 	Make the gtk-color-scheme setting work.
 	
 	* gtk/gtksettings.h: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4394222755..cabd1f8502 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (gtk_text_view_get_border_window_size): Don't
+	fall thru to the wrong window types.  (#323843)
+
 	Make the gtk-color-scheme setting work.
 	
 	* gtk/gtksettings.h: 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index f0249052ea..7804fcfad6 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -8057,18 +8057,22 @@ gtk_text_view_get_border_window_size (GtkTextView       *text_view,
     case GTK_TEXT_WINDOW_LEFT:
       if (text_view->left_window)
         return text_view->left_window->requisition.width;
+      break;
       
     case GTK_TEXT_WINDOW_RIGHT:
       if (text_view->right_window)
         return text_view->right_window->requisition.width;
+      break;
       
     case GTK_TEXT_WINDOW_TOP:
       if (text_view->top_window)
         return text_view->top_window->requisition.height;
+      break;
 
     case GTK_TEXT_WINDOW_BOTTOM:
       if (text_view->bottom_window)
         return text_view->bottom_window->requisition.height;
+      break;
       
     default:
       g_warning ("Can only get size of left/right/top/bottom border windows with gtk_text_view_get_border_window_size()");