diff --git a/powerline/bindings/bash/powerline.sh b/powerline/bindings/bash/powerline.sh
index 8f69546f..75f8e08d 100644
--- a/powerline/bindings/bash/powerline.sh
+++ b/powerline/bindings/bash/powerline.sh
@@ -10,8 +10,13 @@ _powerline_columns_fallback() {
 	return 0
 }
 
+_powerline_tmux_pane() {
+	echo "${TMUX_PANE:-`TMUX="$_POWERLINE_TMUX" tmux display -p "#D"`}" | \
+		tr -d ' %'
+}
+
 _powerline_tmux_setenv() {
-	TMUX="$_POWERLINE_TMUX" tmux setenv -g TMUX_"$1"_`tmux display -p "#D" | tr -d %` "$2"
+	TMUX="$_POWERLINE_TMUX" tmux setenv -g TMUX_"$1"_`_powerline_tmux_pane` "$2"
 	TMUX="$_POWERLINE_TMUX" tmux refresh -S
 }
 
diff --git a/powerline/bindings/fish/powerline-setup.fish b/powerline/bindings/fish/powerline-setup.fish
index 4c80cae7..f9539e7b 100644
--- a/powerline/bindings/fish/powerline-setup.fish
+++ b/powerline/bindings/fish/powerline-setup.fish
@@ -82,9 +82,17 @@ function powerline-setup
 	if env $POWERLINE_CONFIG_COMMAND shell --shell=fish uses tmux
 		if test -n "$TMUX"
 			if tmux refresh -S ^/dev/null
+				set -g _POWERLINE_TMUX "$TMUX"
+				function _powerline_tmux_pane
+					if test -z "$TMUX_PANE"
+						env TMUX="$_POWERLINE_TMUX" tmux display -p "#D" | tr -d ' %'
+					else
+						echo "$TMUX_PANE" | tr -d ' %'
+					end
+				end
 				function _powerline_tmux_setenv
-					tmux setenv -g TMUX_$argv[1]_(tmux display -p "#D" | tr -d "%") "$argv[2]"
-					tmux refresh -S
+					env TMUX="$_POWERLINE_TMUX" tmux setenv -g TMUX_$argv[1]_(_powerline_tmux_pane) "$argv[2]"
+					env TMUX="$_POWERLINE_TMUX" tmux refresh -S
 				end
 				function --on-variable PWD _powerline_tmux_set_pwd
 					_powerline_tmux_setenv PWD "$PWD"
diff --git a/powerline/bindings/rc/powerline.rc b/powerline/bindings/rc/powerline.rc
index 15b313a9..a6d96eff 100644
--- a/powerline/bindings/rc/powerline.rc
+++ b/powerline/bindings/rc/powerline.rc
@@ -36,6 +36,14 @@ fn _powerline_common_setup {
 	_POWERLINE_SAVED_PWD = ''
 }
 
+fn _powerline_tmux_pane {
+	if (test x$TMUX_PANE '!=' x) {
+		echo $TMUX_PANE | tr -d ' %'
+	} else {
+		TMUX=$_POWERLINE_TMUX tmux display -p '#D' | tr -d ' %'
+	}
+}
+
 fn _powerline_tmux_setenv {
 }
 
@@ -73,7 +81,7 @@ if (test x$POWERLINE_CONFIG_COMMAND '!=' x) {
 			fn _powerline_tmux_setenv {
 				if (test x$2 '!=' x) {
 					TMUX=$_POWERLINE_TMUX tmux setenv -g TMUX_$1^_`{
-						TMUX=$_POWERLINE_TMUX tmux display -p '#D' | tr -d %
+						_powerline_tmux_pane
 					} $2
 				}
 			}
diff --git a/powerline/bindings/shell/powerline.sh b/powerline/bindings/shell/powerline.sh
index 3b8261d7..d2339a1b 100644
--- a/powerline/bindings/shell/powerline.sh
+++ b/powerline/bindings/shell/powerline.sh
@@ -104,8 +104,13 @@ _powerline_set_command() {
 	fi
 }
 
+_powerline_tmux_pane() {
+	echo "${TMUX_PANE:-`TMUX="$_POWERLINE_TMUX" tmux display -p "#D"`}" | \
+		tr -d ' %'
+}
+
 _powerline_tmux_setenv() {
-	TMUX="$_POWERLINE_TMUX" tmux setenv -g TMUX_"$1"_`tmux display -p "#D" | tr -d %` "$2"
+	TMUX="$_POWERLINE_TMUX" tmux setenv -g TMUX_"$1"_`_powerline_tmux_pane` "$2"
 	TMUX="$_POWERLINE_TMUX" tmux refresh -S
 }
 
diff --git a/powerline/bindings/tcsh/powerline.tcsh b/powerline/bindings/tcsh/powerline.tcsh
index bba34280..4897b4c1 100644
--- a/powerline/bindings/tcsh/powerline.tcsh
+++ b/powerline/bindings/tcsh/powerline.tcsh
@@ -21,7 +21,17 @@ else
 	endif
 endif
 if ( { $POWERLINE_CONFIG_COMMAND shell --shell=tcsh uses tmux } ) then
-	alias _powerline_tmux_set_pwd 'if ( $?TMUX && { tmux refresh -S >&/dev/null } ) tmux setenv -g TMUX_PWD_`tmux display -p "#D" | tr -d %` $PWD:q ; if ( $?TMUX ) tmux refresh -S >&/dev/null'
+	if ( $?TMUX_PANE ) then
+		if ( "$TMUX_PANE" == "" ) then
+			set _POWERLINE_TMUX_PANE="`tmux display -p '#D'`"
+		else
+			set _POWERLINE_TMUX_PANE="$TMUX_PANE"
+		endif
+	else
+		set _POWERLINE_TMUX_PANE="`tmux display -p '#D'`"
+	endif
+	set _POWERLINE_TMUX_PANE="`echo $_POWERLINE_TMUX_PANE:q | tr -d '% '`"
+	alias _powerline_tmux_set_pwd 'if ( $?TMUX && { tmux refresh -S >&/dev/null } ) tmux setenv -g TMUX_PWD_$_POWERLINE_TMUX_PANE $PWD:q ; if ( $?TMUX ) tmux refresh -S >&/dev/null'
 	alias cwdcmd "`alias cwdcmd` ; _powerline_tmux_set_pwd"
 endif
 if ( { $POWERLINE_CONFIG_COMMAND shell --shell=tcsh uses prompt } ) then
diff --git a/powerline/bindings/zsh/powerline.zsh b/powerline/bindings/zsh/powerline.zsh
index 9c902440..d1374350 100644
--- a/powerline/bindings/zsh/powerline.zsh
+++ b/powerline/bindings/zsh/powerline.zsh
@@ -20,6 +20,11 @@ _powerline_append_precmd_function() {
 
 integer _POWERLINE_JOBNUM
 
+_powerline_tmux_pane() {
+	local -x TMUX="$_POWERLINE_TMUX"
+	echo "${TMUX_PANE:-`tmux display -p "#D"`}" | tr -d ' %'
+}
+
 _powerline_init_tmux_support() {
 	emulate -L zsh
 	if test -n "$TMUX" && tmux refresh -S &>/dev/null ; then
@@ -29,7 +34,7 @@ _powerline_init_tmux_support() {
 		function -g _powerline_tmux_setenv() {
 			emulate -L zsh
 			local -x TMUX="$_POWERLINE_TMUX"
-			tmux setenv -g TMUX_"$1"_$(tmux display -p "#D" | tr -d %) "$2"
+			tmux setenv -g TMUX_"$1"_$(_powerline_tmux_pane) "$2"
 			tmux refresh -S
 		}