diff --git a/libs/draw.c b/libs/draw.c
index 7d66b32..cd4f3ea 100644
--- a/libs/draw.c
+++ b/libs/draw.c
@@ -244,6 +244,11 @@ drawmenu(void)
 			);
         }
 
+        if (lines > i) {
+            lines = i;
+            resizeclient();
+        }
+
 	} else if (matches) {
 		/* draw horizontal list */
 		x += inputw;
diff --git a/spmenu.c b/spmenu.c
index 9a5e911..dd27ad2 100644
--- a/spmenu.c
+++ b/spmenu.c
@@ -229,14 +229,14 @@ static char *(*fstrstr)(const char *, const char *) = cistrstr;
 #include "libs/key.c"
 #include "libs/mouse.c"
 #include "libs/sort.c"
+#include "libs/client.h"
+#include "libs/client.c"
 #include "libs/draw.c"
 #include "libs/schemes.c"
 #include "libs/argv.h"
 #include "libs/argv.c"
 #include "libs/xrdb.c"
 #include "libs/mode.c"
-#include "libs/client.h"
-#include "libs/client.c"
 #include "libs/match.h"
 #include "libs/match.c"
 #include "libs/arg.c"