diff --git a/ChangeLog b/ChangeLog
index 9a47df8..4c6e04f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2007-11-14  Richard Purdie  <rpurdie@opened.com>
+2008-02-07  Richard Purdie  <rpurdie@openedhand.com>
+
+	* src/matchbox-keyboard-ui.c:
+	Stop the keyboard scaling beyond a sensible height on wide screens
+
+2007-11-14  Richard Purdie  <rpurdie@openedhand.com>
  
 	* configure.ac:
 	Stop -L/lib being added to compiler commandline and breaking builds
diff --git a/src/matchbox-keyboard-ui.c b/src/matchbox-keyboard-ui.c
index a1afadc..0c4a98e 100644
--- a/src/matchbox-keyboard-ui.c
+++ b/src/matchbox-keyboard-ui.c
@@ -859,6 +859,10 @@ mb_kbd_ui_resize(MBKeyboardUI *ui, int width, int height)
 
   MARK();
 
+  /* Don't scale beyond a sensible height on wide screens */
+  if (height > (ui->dpy_height / 3))
+    height = ui->dpy_height / 3;
+
   width_diff  = width  - ui->base_alloc_width; 
   height_diff = height - ui->base_alloc_height;