diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt
index bcaf938b..dfdf7e91 100644
--- a/desktop/gametodos.txt
+++ b/desktop/gametodos.txt
@@ -26,14 +26,6 @@
 + gang dude should pop the georgia dream
 + you can drink the strength potion while in blood clots hand
 + try to have dialogue for every wrong interaction
-+ z order pot in antique
-+ You cannot interrupt actions, for example, if I click the edge of
-  the screen, but decide I don't want to go to the next screen,
-  there's no way to interrupt. Similarly, when I'm coming onto the
-  screen and I start clicking to move somewhere I have to wait for the
-  "entering the screen" animation to finish before I can click. There
-  are some other similar situations not having to do with screen
-  transitions.
   - Sometimes I end up clicking places kind of expecting to go there,
   but you have to click on the path. One example is going to see the
   sheep. I'd like to click in the sheep pasture and expect Tick to
diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj
index 29390141..c76f35e0 100644
--- a/desktop/src-common/advent/screens/rooms/inside_jail.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj
@@ -137,16 +137,19 @@
                            :ego "Seems like a pretty sorry excuse for a puzzle."))))
 
 (defn tie-up-warden [entities message]
-  (actions/play-animation entities :ego :idea)
-  (actions/do-dialogue entities
-                       :ego "I know!"
-                       :ego message)
-  (actions/walk-to entities :ego [91 61] :face :left)
-  (actions/play-animation entities :ego :reach)
-  (actions/do-dialogue entities
-                :warden "Hey! What do you think you're doing?"
-                :warden "Back in the slammer you go.")
-  (common/go-to-jail entities))
+  (if (get-in @entities [:state :opened-bars?])
+    (do
+      (actions/play-animation entities :ego :idea)
+      (actions/do-dialogue entities
+                           :ego "I know!"
+                           :ego message)
+      (actions/walk-to entities :ego [91 61] :face :left)
+      (actions/play-animation entities :ego :reach)
+      (actions/do-dialogue entities
+                           :warden "Hey! What do you think you're doing?"
+                           :warden "Back in the slammer you go.")
+      (common/go-to-jail entities))
+    (actions/talk entities :ego "What am I supposed to do while in this cell?")))
 
 (defn search-hay [entities]
   (actions/walk-to entities :ego [144 86] :face :right)