diff --git a/ankiqt/config.py b/ankiqt/config.py
index 84cb0b812..b70907cac 100644
--- a/ankiqt/config.py
+++ b/ankiqt/config.py
@@ -95,6 +95,7 @@ class Config(dict):
             'sortIndex': 0,
             'splitQA': True,
             'standaloneWindows': True,
+            'studyOptionsScreen': 0,
             'suppressEstimates': False,
             'suppressUpdate': False,
             'syncInMsgBox': False,
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index d64958d33..626889bf5 100755
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -1500,6 +1500,7 @@ later by using File>Close.
                      SIGNAL("clicked()"), self.onNewCategoriesClicked)
         self.connect(self.mainWin.revCategories,
                      SIGNAL("clicked()"), self.onRevCategoriesClicked)
+        self.mainWin.tabWidget.setCurrentIndex(self.config['studyOptionsScreen'])
 
     def onNewCategoriesClicked(self):
         ui.activetags.show(self, "newActive", "newInactive")
@@ -1595,6 +1596,7 @@ later by using File>Close.
         self.mainWin.revCategoryLabel.setText(rev)
 
     def updateStudyStats(self):
+        self.mainWin.buttonStack.hide()
         self.deck.reset()
         self.updateActives()
         wasReached = self.deck.sessionLimitReached()
@@ -1738,6 +1740,7 @@ learnt today")
             self.deck.flushMod()
         self.deck.reset()
         self.deck.startSession()
+        self.config['studyOptionsScreen'] = self.mainWin.tabWidget.currentIndex()
         self.moveToState("getQuestion")
 
     def onStudyOptions(self):