diff --git a/js/client-battle.js b/js/client-battle.js
index 58c745568..6fc086b2f 100644
--- a/js/client-battle.js
+++ b/js/client-battle.js
@@ -619,7 +619,7 @@
 			this.battle.skipTurn();
 		},
 		goToEnd: function() {
-			while (this.battle.activityQueueActive) this.battle.skipTurn();
+			this.battle.fastForwardTo(-1);
 		},
 		register: function(userid) {
 			var registered = app.user.get('registered');