diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index df312b2ef..300c8cf01 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -186,7 +186,6 @@ class AnkiQt(QMainWindow):
             self.updateMarkAction()
             self.runHook('showQuestion')
         elif state == "showAnswer":
-            self.currentCard.stopTimer()
             self.resetButtons()
             self.showEaseButtons()
             self.enableCardMenuItems()
diff --git a/ankiqt/ui/status.py b/ankiqt/ui/status.py
index 4d5a43384..a0fe71d3a 100644
--- a/ankiqt/ui/status.py
+++ b/ankiqt/ui/status.py
@@ -241,7 +241,7 @@ You should aim to answer each question within<br>
             return
         if not self.timer:
             return
-        if self.main.state in "showQuestion":
+        if self.main.state in ("showQuestion", "showAnswer"):
             t = self.main.currentCard.thinkingTime()
             if t < 60:
                 self.timer.setText('00:%02d' % t)