diff --git a/aqt/main.py b/aqt/main.py
index 0cd1b597e..0f34efecb 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -539,6 +539,7 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
             self.moveToState("deckBrowser")
         elif key == "s":
             if self.state == "overview":
+                self.col.startTimebox()
                 self.moveToState("review")
             else:
                 self.moveToState("overview")
diff --git a/aqt/overview.py b/aqt/overview.py
index 6daeccd16..777a0b247 100644
--- a/aqt/overview.py
+++ b/aqt/overview.py
@@ -36,6 +36,7 @@ class Overview(object):
     def _linkHandler(self, url):
         print "link", url
         if url == "study":
+            self.mw.col.startTimebox()
             self.mw.moveToState("review")
         elif url == "anki":
             print "anki menu"
diff --git a/aqt/reviewer.py b/aqt/reviewer.py
index 31981367a..432914ea6 100644
--- a/aqt/reviewer.py
+++ b/aqt/reviewer.py
@@ -72,6 +72,11 @@ class Reviewer(object):
             self._initWeb()
         else:
             self._showQuestion()
+        elapsed = self.mw.col.timeboxReached()
+        if elapsed:
+            tooltip(_("%(cards)d cards studied in %(mins)s minutes.") %
+                    dict(cards=elapsed[1], mins=elapsed[0]/60))
+            self.mw.col.startTimebox()
 
     # Audio
     ##########################################################################