diff --git a/www/js/const.js b/www/js/const.js
index 3edf576..d853f18 100644
--- a/www/js/const.js
+++ b/www/js/const.js
@@ -1,6 +1,7 @@
 let MAIN = null;
 let MENU = null;
 let SCENE = null;
+let SCENE_FORWARD = null;
 
 let CONNECTED = false;
 let SOCKET = null;
diff --git a/www/js/scene.js b/www/js/scene.js
index 1f88df9..d6f4e84 100644
--- a/www/js/scene.js
+++ b/www/js/scene.js
@@ -507,7 +507,10 @@ const SCENES = {
                 button_resign.setAttribute("id", "button-resign");
                 buttons_bottom.push(button_resign);
             }
-            buttons_bottom.push(UI.button(LANG("back"), () => { LOAD(SCENES.Browse) }));
+            buttons_bottom.push(UI.button(LANG("back"), () => {
+                if(SCENE_FORWARD !== null) { LOAD(SCENE_FORWARD); }
+                else { LOAD(SCENES.Browse); }
+            }));
             
             UI.nav([
                 UI.button(LANG("rotate"), () => { INTERFACE.rotate(); }),
diff --git a/www/js/ui.js b/www/js/ui.js
index eb200b9..c025359 100644
--- a/www/js/ui.js
+++ b/www/js/ui.js
@@ -172,6 +172,7 @@ const UI = {
         for(let r = 0; r < records.length; ++r) {
             let buttons = [ ];
             let join_callback = function() {
+                SCENE_FORWARD = SCENE;
                 LOAD(SCENES.Game, {
                     token:this.token,
                     mode:INTERFACE.Mode.Player,
@@ -181,6 +182,7 @@ const UI = {
             join_callback = join_callback.bind({token: records[r].token});
 
             let spectate_callback = function() {
+                SCENE_FORWARD = SCENE;
                 LOAD(SCENES.Game, {
                     token:this.token,
                     mode:INTERFACE.Mode.Review,
@@ -264,6 +266,7 @@ const UI = {
         for(let r = 0; r < records.length; ++r) {
             let buttons = [ ];
             let view_callback = function() {
+                SCENE_FORWARD = SCENE;
                 LOAD(SCENES.Game, {
                     token:this.token,
                     mode:INTERFACE.Mode.Review,