diff --git a/init-package/init-popwin.el b/init-package/init-popwin.el
new file mode 100644
index 000000000..4c1617ca0
--- /dev/null
+++ b/init-package/init-popwin.el
@@ -0,0 +1,4 @@
+(require 'popwin)
+(setq display-buffer-function 'popwin:display-buffer)
+(push '("^\*helm .+\*$" :regexp t) popwin:special-display-config)
+(push '("^\*helm-.+\*$" :regexp t) popwin:special-display-config)
diff --git a/packages.el b/packages.el
index e239287a5..eb8a10a61 100644
--- a/packages.el
+++ b/packages.el
@@ -57,6 +57,7 @@
     paredit
     powerline
     popup
+    popwin
     projectile
     puppet-mode
     python