diff --git a/haskell-player.cabal b/haskell-player.cabal
--- a/haskell-player.cabal
+++ b/haskell-player.cabal
@@ -1,5 +1,5 @@
 name:                haskell-player
-version:             0.1.1.0
+version:             0.1.2.0
 synopsis:            A terminal music player based on afplay
 description:         Please see README.md
 homepage:            https://github.com/potomak/haskell-player
diff --git a/src/Player.hs b/src/Player.hs
--- a/src/Player.hs
+++ b/src/Player.hs
@@ -2,7 +2,6 @@
 -- TODO: search
 -- TODO: go to playing song
 -- TODO: next/previous
--- TODO: stop on exit
 
 {-# LANGUAGE OverloadedStrings #-}
 
@@ -122,9 +121,11 @@
                   playback = Just (Playback pos proc duration duration tId)
                 }
     -- press q to quit
-    VtyEvent (V.EvKey (V.KChar 'q') []) ->
-      -- TODO: stop any current playing process
+    VtyEvent (V.EvKey (V.KChar 'q') []) -> do
+      -- stop current process if present
+      maybe (return ()) (liftIO . stopPlayingSong) mPlayback
       M.halt app
+
     -- any other event
     VtyEvent ev -> do
       l' <- handleEvent ev l