diff --git a/source/rofi.c b/source/rofi.c
index 80e9de58..2eab2dca 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -1442,7 +1442,7 @@ static void menu_mainloop_iter ( MenuState *state, XEvent *ev )
                     }
                     else{
                         // Nothing entered and nothing selected.
-                        state->retv = MENU_CANCEL;
+                        state->retv = MENU_CUSTOM_INPUT;
                     }
                     if ( shift ) {
                         state->retv |= MENU_SHIFT;
diff --git a/test/run_dmenu_empty.sh b/test/run_dmenu_empty.sh
index f241dd3e..fc0ebf54 100755
--- a/test/run_dmenu_empty.sh
+++ b/test/run_dmenu_empty.sh
@@ -8,7 +8,7 @@ xdotool key Return
 wait ${RPID}
 RETV=$?
 
-if [ ${RETV} -eq 1 ]
+if [ ${RETV} -eq 0 ]
 then
     exit 0
 else