diff --git a/src/df/gfx/df_views.c b/src/df/gfx/df_views.c
index 9ed2d0c6..3bfbd4d9 100644
--- a/src/df/gfx/df_views.c
+++ b/src/df/gfx/df_views.c
@@ -807,7 +807,7 @@ df_eval_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_EvalW
       UI_NavActionList *nav_actions = ui_nav_actions();
       for(UI_NavActionNode *n = nav_actions->first; n != 0; n = n->next)
       {
-        if(n->v.insertion.size != 0 || n->v.flags & UI_NavActionFlag_Paste)
+        if(!str8_match(n->v.insertion, str8_lit(" "), 0) && (n->v.insertion.size != 0 || n->v.flags & UI_NavActionFlag_Paste))
         {
           edit_begin = 1;
           break;
diff --git a/src/ui/ui_core.c b/src/ui/ui_core.c
index aa0946f0..60ab7020 100644
--- a/src/ui/ui_core.c
+++ b/src/ui/ui_core.c
@@ -2437,7 +2437,8 @@ ui_signal_from_box(UI_Box *box)
   B32 keyboard_click = 0;
   if(!disabled && is_focused && box->flags & UI_BoxFlag_KeyboardClickable)
   {
-    if(os_key_press(ui_events(), ui_window(), 0, OS_Key_Return))
+    if(os_key_press(ui_events(), ui_window(), 0, OS_Key_Return) != 0 ||
+       os_key_press(ui_events(), ui_window(), 0, OS_Key_Space) != 0)
     {
       keyboard_click = 1;
       result.clicked = 1;