diff --git a/geometry.cpp b/geometry.cpp
index e055a040a8..f7a340c08b 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -993,6 +993,8 @@ QSize Client::adjustedSize( const QSize& frame, Sizemode mode ) const
 
     QSize wsize( frame.width() - ( border_left + border_right ),
              frame.height() - ( border_top + border_bottom ));
+    if( wsize.isEmpty())
+        wsize = QSize( 1, 1 );
 
     return sizeForClientSize( wsize, mode, false );
     }