diff --git a/index-rlg.html b/index-rlg.html
index 7780f67..81a9ad0 100644
--- a/index-rlg.html
+++ b/index-rlg.html
@@ -91,6 +91,8 @@
 </div>
 </div>
 <div class="centerb"><span class="ibutton" onclick="toggleBlock('keys')">Keyboard</span></div>
+</div>
+<div class="modal" id="playctl">
 <div class="rfloat"><span class="ibutton" onclick="stop()">Stop</span></div>
 <div class="rfloat">Font:
 <span onclick="textsize(false)" class="ibutton">Smaller</span>
diff --git a/rlgterm.js b/rlgterm.js
index f6af361..46ce78e 100644
--- a/rlgterm.js
+++ b/rlgterm.js
@@ -662,7 +662,7 @@ function startwatching(gamenumber) {
       setTitle("Watching");
       debug(1, "Watching with id " + session.id);
       message("You are now watching.");
-      setmode("play");
+      setmode("watch");
       getData();
     }
     else if (reply.t == 'E') {
@@ -725,6 +725,10 @@ function gameover() {
   if (session.id == null)
     return;
   /* TODO IFACE2 If the end was unexpected, tell player the game was saved. */
+  if (session.playing)
+    message("Finished playing.");
+  else
+    message("Finished watching.");
   session.id = null;
   session.playing = false;
   ajaxstate.clear();
@@ -767,13 +771,23 @@ function setmode(mode, ev) {
     ev.preventDefault();
   if (mode == "play") {
     document.getElementById("keyboard").style.display = "block";
+    document.getElementById("playctl").style.display = "block";
     document.getElementById("startgame").style.display = "none";
     document.getElementById("login").style.display = "none";
     document.getElementById("register").style.display = "none";
     document.getElementById("current").style.display = "none";
   }
-  if (mode == "choose") {
+  else if (mode == "watch") {
     document.getElementById("keyboard").style.display = "none";
+    document.getElementById("playctl").style.display = "block";
+    document.getElementById("startgame").style.display = "none";
+    document.getElementById("login").style.display = "none";
+    document.getElementById("register").style.display = "none";
+    document.getElementById("current").style.display = "none";
+  }
+  else if (mode == "choose") {
+    document.getElementById("keyboard").style.display = "none";
+    document.getElementById("playctl").style.display = "none";
     document.getElementById("startgame").style.display = "block";
     document.getElementById("login").style.display = "none";
     document.getElementById("register").style.display = "none";
@@ -782,6 +796,7 @@ function setmode(mode, ev) {
   }
   else if (mode == "login") {
     document.getElementById("keyboard").style.display = "none";
+    document.getElementById("playctl").style.display = "none";
     document.getElementById("startgame").style.display = "none";
     document.getElementById("login").style.display = "block";
     document.getElementById("register").style.display = "none";
@@ -790,6 +805,7 @@ function setmode(mode, ev) {
   }
   else if (mode == "register") {
     document.getElementById("keyboard").style.display = "none";
+    document.getElementById("playctl").style.display = "none";
     document.getElementById("startgame").style.display = "none";
     document.getElementById("login").style.display = "none";
     document.getElementById("register").style.display = "block";