diff --git a/keybindings.el b/keybindings.el
index 3a1469f..d0ec82c 100644
--- a/keybindings.el
+++ b/keybindings.el
@@ -210,6 +210,10 @@
   (define-key elscreen-map (kbd ";")   'elscreen-display-screen-name-list)
   (define-key elscreen-map (kbd "C-;") 'elscreen-display-screen-name-list))
 
+(when (require 'workgroups2 nil 'noerror)
+  (setq wg-prefix-key (kbd "C-z"))
+)
+
 (when (require 'perspective nil 'noerror)
   (define-key persp-mode-map (kbd "C-z") perspective-map)
 
diff --git a/packages.el b/packages.el
index 5feea39..4946cec 100644
--- a/packages.el
+++ b/packages.el
@@ -81,6 +81,7 @@
     twilight-anti-bright-theme
     twilight-bright-theme
     undo-tree
+    ;; workgroups2
     writegood-mode
     writeroom-mode
     yaml-mode
@@ -156,6 +157,10 @@
   (when (require 'escreen nil 'noerror)
     (escreen-install))
 
+  ;; Load and setup Workgroups2
+  (when (require 'workgroups2 nil 'noerror)
+    (workgroups-mode 1))
+
   ;; Load ruby-electric (autoload fails)
   (require 'ruby-electric)