   (evil-collection-emms-playlist-mode-paste-before))
 
 (defun evil-collection-emms-browser-setup ()
+  "Set up `evil' bindings for `emms-browser'."
   ;; TODO: Why doesn't evil-set-initial-state work with emms-browser-mode?
-  (add-hook 'emms-browser-mode-hook 'evil-motion-state)
-
-  (evil-define-key 'motion emms-browser-mode-map
+
+  (evil-collection-inhibit-insert-state emms-browser-mode-map)
+  (add-hook 'emms-browser-mode-hook 'evil-normal-state)
+  (evil-define-key 'normal emms-browser-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

  (evil-define-key 'normal emms-browser-search-mode-map
    "q" 'emms-browser-kill-search)

  (evil-set-initial-state 'emms-metaplaylist-mode 'normal)
  (evil-define-key 'normal emms-metaplaylist-mode-map
    (kbd "<return>") 'emms-metaplaylist-mode-goto-current
    (kbd "<space>") 'emms-metaplaylist-mode-set-active
