diff --git a/debian/changelog b/debian/changelog
index 6dabadb1..a9543ce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 byobu (5.106) unreleased; urgency=medium
 
-  * UNRELEASED
+  * usr/lib/byobu/include/tmux-send-command-to-all-panes:
+    - fix breakage on sending command to all panes
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 07 Apr 2016 18:50:57 -0500
 
diff --git a/usr/lib/byobu/include/tmux-send-command-to-all-panes b/usr/lib/byobu/include/tmux-send-command-to-all-panes
index b3fc6653..1006ff09 100755
--- a/usr/lib/byobu/include/tmux-send-command-to-all-panes
+++ b/usr/lib/byobu/include/tmux-send-command-to-all-panes
@@ -17,7 +17,8 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-for w in $(tmux list-panes | $BYOBU_SED -e "s/:.*//"); do
-	tmux send-keys -t $w "$@"
-	tmux send-keys -t $w Enter
+w=$(tmux list-windows | grep "\*" | awk -F: '{print $1}')
+for p in $(tmux list-panes | $BYOBU_SED -e "s/:.*//"); do
+	tmux send-keys -t $w.$p "$@" || true
+	tmux send-keys -t $w.$p Enter || true
 done