diff --git a/retroshare-gui/src/gui/common/rwindow.cpp b/retroshare-gui/src/gui/common/rwindow.cpp
index 32cfba943..e86be7fa2 100644
--- a/retroshare-gui/src/gui/common/rwindow.cpp
+++ b/retroshare-gui/src/gui/common/rwindow.cpp
@@ -76,11 +76,20 @@ RWindow::restoreWindowState()
     m_bSaveStateOnClose = true; // now we save the window state on close
 
 #if QT_VERSION >= 0x040200
-  QByteArray geometry = getSetting("Geometry", QByteArray()).toByteArray();
-  if (geometry.isEmpty())
+  QByteArray geo = getSetting("Geometry", QByteArray()).toByteArray();
+  if (geo.isEmpty())
+  {
     adjustSize();
+    QRect rect = geometry();
+    int h = fontMetrics().height()*40;
+    if (rect.height()<h)
+    {
+      rect.setHeight(h);
+      setGeometry(rect);
+    }
+  }
   else
-    restoreGeometry(geometry);
+    restoreGeometry(geo);
 #else
   QRect screen = QDesktopWidget().availableGeometry();