diff --git a/functional-core/app/app-update.sml b/functional-core/app/app-update.sml
index eecc2be..d70f12f 100644
--- a/functional-core/app/app-update.sml
+++ b/functional-core/app/app-update.sml
@@ -184,6 +184,11 @@ struct
       SOME (hIdx, vIdx) => addCoordinates (model, hIdx, vIdx)
     | NONE => (model, NO_MAILBOX)
 
+  fun enterOrSpaceCoordinates model =
+    let val {arrowX, arrowY, ...} = model
+    in addCoordinates (model, arrowX, arrowY)
+    end
+
   fun resizeWindow (model, width, height) =
     let
       val model = AppWith.windowResize (model, width, height)
@@ -366,6 +371,8 @@ struct
     | ARROW_LEFT => moveArrowLeft model
     | ARROW_RIGHT => moveArrowRight model
     | ARROW_DOWN => moveArrowDown model
+    | KEY_ENTER => enterOrSpaceCoordinates model
+    | KEY_SPACE => enterOrSpaceCoordinates model
     | USE_TRIANGLES triangles => useTriangles (model, triangles)
     | TRIANGLES_LOAD_ERROR => trianglesLoadError model
 end
diff --git a/message-types/input-msg.sml b/message-types/input-msg.sml
index 1feedcb..96ef22a 100644
--- a/message-types/input-msg.sml
+++ b/message-types/input-msg.sml
@@ -15,6 +15,8 @@ sig
   | ARROW_LEFT
   | ARROW_RIGHT
   | ARROW_DOWN
+  | KEY_ENTER
+  | KEY_SPACE
   | USE_TRIANGLES of AppType.triangle list
   | TRIANGLES_LOAD_ERROR
 end
@@ -36,6 +38,8 @@ struct
   | ARROW_LEFT
   | ARROW_RIGHT
   | ARROW_DOWN
+  | KEY_ENTER
+  | KEY_SPACE
   | USE_TRIANGLES of AppType.triangle list
   | TRIANGLES_LOAD_ERROR
 end