diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 87182fe..0d3698e 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -141,10 +141,6 @@ MODE1 is enabled and vice-versa."
   "Set the `disabled' property for each item in FUNCTIONS to nil."
   (mapc #'(lambda (f) (put f 'disabled nil)) functions))
 
-(defun oni:set-keys-for-dired ()
-  "Set some keybindings for `dired'."
-  (local-set-key (kbd "E") #'wdired-change-to-wdired-mode))
-
 (defun oni:set-keys-for-hy ()
   "Set some keybindings for `hy-mode'."
   (local-set-key (kbd "{") #'paredit-open-curly)
@@ -397,9 +393,6 @@ If no direction is given, don't split."
                              "contacts.org" "work") eol))))
   (add-to-list 'desktop-globals-to-clear 'desktop-dirname))
 
-(stante-after dired
-  (add-hook 'dired-mode-hook #'oni:set-keys-for-dired))
-
 (stante-after eap
   (setq eap-music-library "/mnt/music")
   (setq eap-playlist-library "~/music/playlists"))
@@ -732,6 +725,9 @@ If no direction is given, don't split."
 ;; Make `whitespace-mode' show tabs
 (add-hook 'python-mode-hook 'oni:set-whitespace-tab-display)
 
+;; Set Dired-specific keybindings
+(add-hook 'dired-mode-hook 'oni:set-keys-for-dired)
+
 (oni:add-function-to-hooks 'oni:make-readable
   'Info-mode-hook 'gnus-article-mode-hook 'gnus-group-mode-hook
   'org-agenda-mode-hook)
diff --git a/emacs/.emacs.d/site-lisp/oni-dired.el b/emacs/.emacs.d/site-lisp/oni-dired.el
new file mode 100644
index 0000000..41df7f1
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-dired.el
@@ -0,0 +1,35 @@
+;;; oni-dired.el --- Extra commands and functions for dired  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Here are some functions and commands related to Dired.
+
+;;; Code:
+
+(require 'dired)
+
+;;;###autoload
+(defun oni:set-keys-for-dired ()
+  "Set some keybindings for `dired'."
+  (define-key dired-mode-map (kbd "E") #'wdired-change-to-wdired-mode))
+
+(provide 'oni-dired)
+;;; oni-dired.el ends here