diff --git a/source/dmenu-dialog.c b/source/dmenu-dialog.c
index 15af8b27..92b7eb09 100644
--- a/source/dmenu-dialog.c
+++ b/source/dmenu-dialog.c
@@ -85,7 +85,7 @@ SwitcherMode dmenu_switcher_dialog ( char **input )
         fputs ( *input, stdout );
     }
 
-    for ( unsigned int i = 0; i < length ; i++ ) {
+    for ( unsigned int i = 0; i < length; i++ ) {
         free ( list[i] );
     }
 
diff --git a/source/textbox.c b/source/textbox.c
index 7adb18f5..ad8db382 100644
--- a/source/textbox.c
+++ b/source/textbox.c
@@ -403,7 +403,7 @@ int textbox_keypress ( textbox *tb, XEvent *ev )
         textbox_cursor_bkspc ( tb );
         return 1;
     }
-    else if ( key == XK_Return ) {
+    else if ( key == XK_Return || key == XK_KP_Enter ) {
         return -1;
     }
     else if ( !iscntrl ( *pad ) ) {