diff --git a/src/Hamming/App/Events.hs b/src/Hamming/App/Events.hs
index 4323743..da729c9 100644
--- a/src/Hamming/App/Events.hs
+++ b/src/Hamming/App/Events.hs
@@ -46,6 +46,7 @@ import Hamming.App.Types
 -- | Handles an event
 eventHandler :: Handler
 eventHandler (VtyEvent (EvKey (KChar 'c') [MCtrl])) = halt
+eventHandler (VtyEvent (EvKey (KChar 'q') [])) = halt
 eventHandler (VtyEvent (EvKey (KChar 'c') [])) =
   modify $ hammingCode %~ setCheckBits
 eventHandler (VtyEvent (EvKey (KChar 'v') [])) =
@@ -57,7 +58,6 @@ eventHandler e = gets (^.appMode) >>= \case
   EditMode _  -> editHandler e
 
 displayHandler :: Handler
-displayHandler (VtyEvent (EvKey (KChar 'q') [])) = halt
 displayHandler (VtyEvent (EvKey (KChar 'e') [])) =
   modify $ appMode .~ EditMode initialEditor
 displayHandler _ = return ()