diff --git a/ankiqt/config.py b/ankiqt/config.py
index 9652fee92..5e1e1c882 100644
--- a/ankiqt/config.py
+++ b/ankiqt/config.py
@@ -44,6 +44,7 @@ class Config(dict):
             'iconSize': 32,
             'syncOnLoad': True,
             'syncOnClose': True,
+            'syncInMsgBox': False,
             'checkForUpdates': True,
             'interfaceLang': "",
             'syncUsername': "",
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index aa6440c6e..a37695744 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -230,7 +230,7 @@ Please do not file a bug report with Anki.<br><br>""")
                 self.updateRecentFilesMenu()
                 self.updateViews(state)
                 if self.state == "studyScreen":
-                    return self.updateStudyStats()
+                    return self.showStudyScreen()
                 else:
                     return self.moveToState("getQuestion")
             else:
@@ -1822,9 +1822,13 @@ it to your friends.
         self.setStatus("")
 
     def noSyncResponse(self):
-        self.showToolTip(_("""\
+        msg = _("""\
 <h1>Sync Failed</h1>
-Couldn't contact Anki Online. Please check your internet connection."""))
+Couldn't contact Anki Online. Please check your internet connection.""")
+        if self.config['syncInMsgBox']:
+            ui.utils.showWarning(msg)
+        else:
+            self.showToolTip(msg)
 
     def openSyncProgress(self):
         self.syncProgressDialog = QProgressDialog(_("Syncing Media..."),