diff --git a/source/src/menus.cpp b/source/src/menus.cpp
index 0b3d690f..032aaee1 100644
--- a/source/src/menus.cpp
+++ b/source/src/menus.cpp
@@ -38,7 +38,7 @@ void closemenu(const char *name)
 {
     gmenu *m = menus.access(name);
     if(!m) return;
-    if(curmenu==m) menuset(NULL);
+    if(curmenu==m) menuset(menustack.empty() ? NULL : menustack.pop());
     else loopv(menustack)
     {
         if(menustack[i]==m)