diff --git a/behavior.el b/behavior.el
index 5462109..df82f62 100644
--- a/behavior.el
+++ b/behavior.el
@@ -19,6 +19,10 @@
 (when (require 'autopair nil 'noerror)
   (autopair-global-mode))
 
+;; Popwin
+(when (require 'popwin nil 'noerror)
+  (setq display-buffer-function 'popwin:display-buffer))
+
 ;; When using autopair, ECB and delete-selection-mode there's a weird conflict
 ;; which disables delete-selection-mode whenever you click on a directory or
 ;; file in ECB's tree buffer. For that reason, and for it's neat rectangle
diff --git a/keybindings.el b/keybindings.el
index 3feb119..1e601df 100644
--- a/keybindings.el
+++ b/keybindings.el
@@ -6,6 +6,15 @@
 (global-set-key (kbd "C-x C-m") 'execute-extended-command)
 (global-set-key (kbd "C-c C-m") 'execute-extended-command)
 
+;; If Smex is available, use it instead of extended-command
+(when (require 'smex nil 'noerror)
+  (global-set-key (kbd "M-x") 'smex)
+  (global-set-key (kbd "C-x C-m") 'smex)
+  (global-set-key (kbd "C-c C-m") 'smex)
+  (global-set-key (kbd "M-X") 'smex-major-mode-commands)
+  (global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)
+)
+
 ;; Easier version of "C-x k" to kill buffer
 (global-set-key (kbd "C-x C-k") 'kill-buffer)
 
diff --git a/packages.el b/packages.el
index bd89d3d..5a587fc 100644
--- a/packages.el
+++ b/packages.el
@@ -51,6 +51,7 @@
     markdown-mode
     minimap
     php+-mode
+    popwin
     rainbow-mode
     restclient
     ruby-compilation
@@ -59,6 +60,7 @@
     ruby-mode
     sass-mode
     scss-mode
+    smex
     stylus-mode
     textmate
     twilight-anti-bright-theme