diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index a3bea16..9be5696 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -489,6 +489,9 @@ MODE1 is enabled and vice-versa."
 
 (add-hook 'eshell-first-time-mode-hook 'oni-eshell-set-prompt)
 
+;; Don't truncate lines in Helm buffers
+(add-hook 'helm-after-initialize-hook 'oni:stop-truncating-helm-lines)
+
 ;; Automatically make shell scripts executable after saving.
 (add-hook 'after-save-hook
           'executable-make-buffer-file-executable-if-script-p :append)
diff --git a/emacs/.emacs.d/site-lisp/oni-helm.el b/emacs/.emacs.d/site-lisp/oni-helm.el
new file mode 100644
index 0000000..056a06f
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-helm.el
@@ -0,0 +1,35 @@
+;;; oni-helm.el --- Extra commands and functions for helm  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2016  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 extra commands and functions for helm.
+
+;;; Code:
+
+(require 'helm-lib)
+
+(defun oni:stop-truncating-helm-lines ()
+  (with-current-buffer helm-buffer
+    (setq truncate-lines nil
+          truncate-partial-width-windows nil)))
+
+(provide 'oni-helm)
+;;; oni-helm.el ends here