diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index ef7a020..640eb24 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:pop-to-buffer-in-side-window (buffer alist)
-  (display-buffer-in-side-window buffer alist)
-  (select-window (get-buffer-window buffer)))
-
 (defun oni:print-keymap (keymap)
   "Recursively print KEYMAP with keys as characters."
   (mapcar (lambda (itm)
diff --git a/emacs/.emacs.d/site-lisp/oni-display.el b/emacs/.emacs.d/site-lisp/oni-display.el
new file mode 100644
index 0000000..8335126
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-display.el
@@ -0,0 +1,34 @@
+;;; oni-display.el --- Functions for displaying buffers  -*- 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 which help with displaying buffers.
+
+;;; Code:
+
+;;;###autoload
+(defun oni:pop-to-buffer-in-side-window (buffer alist)
+  "Display and select BUFFER in a side window."
+  (display-buffer-in-side-window buffer alist)
+  (select-window (get-buffer-window buffer)))
+
+(provide 'oni-display)
+;;; oni-display.el ends here