diff --git a/templates/cwa/gogame.html.j2 b/templates/cwa/gogame.html.j2
index 4704f42..21539a9 100644
--- a/templates/cwa/gogame.html.j2
+++ b/templates/cwa/gogame.html.j2
@@ -70,7 +70,7 @@
       </svg>
     </div>
 
-    <div id="gameinfo" class="{% if abandoned or score is not none %}over{% elif current_player == colormap[player.uuid]  %}active{% else %}passive{% endif %}">
+    <div id="gameinfo" class="{% if game.is_completed %}over{% elif current_player == colormap[player.uuid]  %}active{% else %}passive{% endif %}">
       {% if abandoned %}
 	<b>Game abandoned</b>
       {% elif score is not none %}
@@ -90,8 +90,12 @@
 	<input id="go-input-col" name="go-input-col" type="hidden" value="-1" />
       {% endif %}
     </div>
-    
-    <a href="{{ baseurl }}/{{ player.uuid }}/{{ game.uuid }}/play">Refresh</a>
+
+    {% if game.is_completed %}
+      <a href="{{ baseurl }}/{{ me.uuid }}">Return to lobby</a>
+    {% else %}
+      <a href="{{ baseurl }}/{{ player.uuid }}/{{ game.uuid }}/play">Refresh</a>
+    {% endif %}
 
     <ul>
       {% for p in players.keys()  %}
diff --git a/templates/cwa/set.html.j2 b/templates/cwa/set.html.j2
index 56aa300..56c8ac4 100644
--- a/templates/cwa/set.html.j2
+++ b/templates/cwa/set.html.j2
@@ -52,7 +52,12 @@
       </li>
     {%- endfor %}
   </ol>
-  <a href="{{ baseurl }}/{{ player.uuid }}/{{ game.uuid }}/play">Refresh</a>
+  
+  {% if game.is_completed %}
+    <a href="{{ baseurl }}/{{ me.uuid }}">Return to lobby</a>
+  {% else %}
+    <a href="{{ baseurl }}/{{ player.uuid }}/{{ game.uuid }}/play">Refresh</a>
+  {% endif %}
 
   <script src="{{ baseurl }}/static/set.js"></script>
 {%- endblock %}
diff --git a/webgames/go.py b/webgames/go.py
index ccda7b5..9d877f9 100644
--- a/webgames/go.py
+++ b/webgames/go.py
@@ -281,7 +281,7 @@ Press Play! to play against GNU Go or invite a second player.
 
     @property
     def is_completed(self) -> bool:
-        return self.black_passed and self.white_passed
+        return (self.black_passed and self.white_passed) or self._abandoned
 
 
 GoPuzzle()