diff --git a/ruby_event_store-browser/elm/src/Layout.elm b/ruby_event_store-browser/elm/src/Layout.elm
index 88699d3435..e9c35d93f9 100644
--- a/ruby_event_store-browser/elm/src/Layout.elm
+++ b/ruby_event_store-browser/elm/src/Layout.elm
@@ -11,7 +11,6 @@ import Html exposing (..)
 import Html.Attributes exposing (class, href, id, list, placeholder, selected, value)
 import Html.Events exposing (onClick, onInput, onSubmit)
 import Http
-import Json.Decode
 import LinkedTimezones exposing (mapLinkedTimeZone)
 import List.Extra
 import Route
@@ -24,11 +23,11 @@ import WrappedModel exposing (..)
 type Msg
     = TimeZoneSelected String
     | SearchMsg Search.Msg
-    | KeyPress String Bool Bool
     | ToggleDialog
     | SearchedStreamsFetched (Result Http.Error (List SearchStream))
     | OnSelect Search.Stream
     | OnQueryChanged Search.Stream
+    | RequestSearch String
 
 
 type alias Model =
@@ -37,20 +36,12 @@ type alias Model =
 
 
 port toggleDialog : String -> Cmd msg
+port requestSearch : (String -> msg) -> Sub msg
 
 
 subscriptions : Sub Msg
 subscriptions =
-    Browser.Events.onKeyDown keyboardDecoder
-
-
-keyboardDecoder : Json.Decode.Decoder Msg
-keyboardDecoder =
-    Json.Decode.map3
-        KeyPress
-        (Json.Decode.field "key" Json.Decode.string)
-        (Json.Decode.field "metaKey" Json.Decode.bool)
-        (Json.Decode.field "ctrlKey" Json.Decode.bool)
+    requestSearch RequestSearch
 
 
 buildModel : Model
@@ -128,16 +119,8 @@ update msg model =
                     Nothing ->
                         ( model, Cmd.none )
 
-        KeyPress key isMetaDown isCtrlDown ->
-            case ( key, isMetaDown, isCtrlDown ) of
-                ( "k", True, False ) ->
-                    ( model, toggleDialog searchModalId )
-
-                ( "k", False, True ) ->
-                    ( model, toggleDialog searchModalId )
-
-                _ ->
-                    ( model, Cmd.none )
+        RequestSearch _ ->
+            ( model, toggleDialog searchModalId )
 
         ToggleDialog ->
             ( model, toggleDialog searchModalId )
diff --git a/ruby_event_store-browser/public/bootstrap.js b/ruby_event_store-browser/public/bootstrap.js
index f0744d54fe..2e344b9d8b 100644
--- a/ruby_event_store-browser/public/bootstrap.js
+++ b/ruby_event_store-browser/public/bootstrap.js
@@ -10,3 +10,10 @@ app.ports.toggleDialog.subscribe(function(id) {
   const dialog = document.querySelector(`#${id}`)
   dialog.open ? dialog.close() : dialog.showModal();
 });
+
+window.addEventListener("keydown", (event) => {
+  if (event.key === "k" && (event.ctrlKey || event.metaKey)) {
+    app.ports.requestSearch.send("")
+    event.preventDefault();
+  }
+});