diff --git a/client/src/components/game.ctrl.btns.jsx b/client/src/components/game.ctrl.btns.jsx
index 3918b5ca..557e0915 100644
--- a/client/src/components/game.ctrl.btns.jsx
+++ b/client/src/components/game.ctrl.btns.jsx
@@ -46,7 +46,6 @@ const addState = connect(
         function quit() {
             dispatch(actions.setNav('transition'));
             dispatch(actions.setGame(null));
-            dispatch(actions.setInstance(null));
         }
 
         function setChatShow(v) {
diff --git a/client/src/components/game.ctrl.btns.top.jsx b/client/src/components/game.ctrl.btns.top.jsx
index 270721c9..55c4caa0 100644
--- a/client/src/components/game.ctrl.btns.top.jsx
+++ b/client/src/components/game.ctrl.btns.top.jsx
@@ -81,7 +81,7 @@ function GameCtrlTopBtns(args) {
         ? 'Offered'
         : drawState ? 'Draw' : 'Offer';
     const drawAction = drawState ? sendDraw : drawStateTrue;
-    const drawBtn = <button class={drawClasses} disabled={finished || drawOffered} onClick={drawAction}>{drawText}</button>;
+    const drawBtn = <button class={drawClasses} disabled={finished || animating || drawOffered} onClick={drawAction}>{drawText}</button>;
 
     return (
         <div class="instance-ctrl-btns">