diff --git a/.tmux.conf b/.tmux.conf
index cd1830a..a008241 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -66,9 +66,6 @@ bind -r l select-pane -R  # move right
 bind > swap-pane -D       # swap current pane with the next one
 bind < swap-pane -U       # swap current pane with the previous one
 
-# maximize current pane
-bind + run 'cut -c3- ~/.tmux.conf | sh -s maximize_pane'
-
 # pane resizing
 bind -r H resize-pane -L 2
 bind -r J resize-pane -D 2
@@ -323,7 +320,6 @@ run 'cut -c3- ~/.tmux.conf | sh -s apply_configuration'
 # }
 #
 # maximize_pane() {
-#   tmux -q -L swap-pane-test -f /dev/null new-session -d \; new-window \; new-window \; swap-pane -t :1 \; kill-session || { tmux display 'your tmux version has a buggy swap-pane command - see ticket #108, fixed in upstream commit 78e783e'; exit; }
 #   __current_pane=$(tmux display -p '#{pane_id}')
 #
 #   __dead_panes=$(tmux list-panes -s -F '#{pane_dead} #{pane_id} #{pane_start_command}' | grep -o '^1 %.\+maximized.\+$' || true)
@@ -517,6 +513,13 @@ run 'cut -c3- ~/.tmux.conf | sh -s apply_configuration'
 # apply_configuration() {
 #  apply_theme
 #  apply_configurable_bindings
+#
+#  if tmux -q -L swap-pane-test -f /dev/null new-session -d \; new-window \; new-window \; swap-pane -t :1 \; kill-session; then
+#    tmux bind + run 'cut -c3- ~/.tmux.conf | sh -s maximize_pane'
+#  else
+#    tmux bind + display 'your tmux version has a buggy swap-pane command - see ticket #108, fixed in upstream commit 78e783e'
+#  fi
+#
 #  for name in $(printenv | grep -Eo ^tmux_conf_[^=]+); do tmux setenv -gu $name; done;
 # }
 #