   "Set up `evil' bindings for `emms'."
   (with-eval-after-load 'emms-browser
     (evil-collection-emms-browser-setup))
-  (evil-set-initial-state 'emms-playlist-mode 'motion)
-
-  (evil-define-key 'motion emms-playlist-mode-map
+
+  (evil-set-initial-state 'emms-playlist-mode 'normal)
+  (evil-define-key 'normal emms-playlist-mode-map
     ;; playback controls
     "x" 'emms-pause
     "X" 'emms-stop

    "gk" 'emms-browser-next-non-track

    (kbd "<tab>") 'emms-browser-toggle-subitems
    (kbd "SPC") 'emms-browser-toggle-subitems
    ;; TODO: Use S-<tab>?
    "g1" 'emms-browser-collapse-all
    "g2" 'emms-browser-expand-to-level-2
    "g3" 'emms-browser-expand-to-level-3

    "]" 'emms-playlist-mode-next
    "[" 'emms-playlist-mode-previous

    "D" 'emms-playlist-mode-kill-track  ; emms-browser uses "D"
    "C" 'emms-playlist-mode-clear
    "O" 'evil-collection-emms-playlist-mode-insert-newline-above
    "o" 'evil-collection-emms-playlist-mode-insert-newline-below
