diff --git a/scripts/adv_windowlist.pl b/scripts/adv_windowlist.pl
index 92a4c6ccb..6ec0b7d54 100644
--- a/scripts/adv_windowlist.pl
+++ b/scripts/adv_windowlist.pl
@@ -520,7 +520,7 @@ sub get_keymap {
 		if (/^change_window (\d+)/i) {
 		    _add_map(\%nummap, $1, $map);
 		}
-		elsif (/^(?:command window goto|change_window) (\S+)/i) {
+		elsif (/^(?:command (?:window goto|go)|change_window) (\S+)/i) {
 		    my $window = $1;
 		    if ($window !~ /\D/) {
 			_add_map(\%nummap, $window, $map);