diff --git a/src/Hamming/App/Events.hs b/src/Hamming/App/Events.hs
index a0a8f08..f060ce5 100644
--- a/src/Hamming/App/Events.hs
+++ b/src/Hamming/App/Events.hs
@@ -44,7 +44,6 @@ 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 e = gets (^.appMode) >>= \case
@@ -52,6 +51,7 @@ 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 ()