diff --git a/aqt/main.py b/aqt/main.py
index cf71e7490..ede9936da 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -628,7 +628,10 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
     ##########################################################################
 
     def onUndo(self):
-        self.col.undo()
+        cid = self.col.undo()
+        if cid:
+            card = self.col.getCard(cid)
+            self.reviewer.cardQueue.append(card)
         self.reset()
         self.maybeEnableUndo()
 
diff --git a/aqt/reviewer.py b/aqt/reviewer.py
index 88a08f1a6..29c453d56 100644
--- a/aqt/reviewer.py
+++ b/aqt/reviewer.py
@@ -52,6 +52,7 @@ class Reviewer(object):
         if self.cardQueue:
             # undone/edited cards to show
             c = self.cardQueue.pop()
+            c.startTimer()
             self.hadCardQueue = True
         else:
             if self.hadCardQueue: