diff --git a/s/Wimp02 b/s/Wimp02
index 2dd08c023311745a721cde1af4cbe42bb3542043..68d1050db991bc7286080d8db35fbd6211ba55ef 100644
--- a/s/Wimp02
+++ b/s/Wimp02
@@ -8841,8 +8841,9 @@ no_thin_outline
 ;
 forcetint_on EntryS "R0,R2"
         LDR     R2, tool_list
-        LDR     R2, [R2]
-        TEQ     R2, #0                  ; don't bother if there aren't any tools
+        TEQ     R2, #0
+        LDRNE   R2, [R2, #tool_back]
+        TEQNE   R2, #0                  ; don't bother if there aren't any tools
         EXITS   EQ
 
         LDRB    R0, tinted_window
@@ -8858,8 +8859,9 @@ forcetint_on EntryS "R0,R2"
 ;
 forcetint_off EntryS "R2"
         LDR     R2, tool_list
-        LDR     R2, [R2]
-        TEQ     R2, #0                  ; don't bother if there aren't any tools
+        TEQ     R2, #0
+        LDRNE   R2, [R2, #tool_back]
+        TEQNE   R2, #0                  ; don't bother if there aren't any tools
         EXITS   EQ
 
         LDRB    R14, tinted_tool