diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index e4d6b2b6d..86f2b144f 100755
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -115,6 +115,9 @@ class AnkiQt(QMainWindow):
         self.connect(self.mainWin.reviewEarlyButton,
                      SIGNAL("clicked()"),
                      self.onReviewEarly)
+        self.connect(self.mainWin.finishButton,
+                     SIGNAL("clicked()"),
+                     self.onClose)
         # notices
         self.mainWin.noticeFrame.setShown(False)
         self.connect(self.mainWin.noticeButton, SIGNAL("clicked()"),
@@ -330,8 +333,8 @@ Please do not file a bug report with Anki.<br>""")
                 not not self.deck.newCount)
             self.startRefreshTimer()
             self.bodyView.setState(state)
-            # make sure the buttons aren't focused
-            self.mainWin.congratsLabel.setFocus()
+            # focus finish button
+            self.mainWin.finishButton.setFocus()
         elif state == "showQuestion":
             self.reviewingStarted = True
             if self.deck.mediaDir():
diff --git a/designer/main.ui b/designer/main.ui
index 0ff6dadee..0eaff733a 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -1213,6 +1213,19 @@
                     </property>
                    </widget>
                   </item>
+                  <item>
+                   <widget class="QPushButton" name="finishButton">
+                    <property name="text">
+                     <string>Fi&amp;nish</string>
+                    </property>
+                    <property name="autoDefault">
+                     <bool>true</bool>
+                    </property>
+                    <property name="default">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
                  </layout>
                 </item>
                </layout>
@@ -3456,6 +3469,7 @@
   <tabstop>optionsHelpButton</tabstop>
   <tabstop>learnMoreButton</tabstop>
   <tabstop>reviewEarlyButton</tabstop>
+  <tabstop>finishButton</tabstop>
   <tabstop>downloadDeckButton</tabstop>
   <tabstop>newDeckButton</tabstop>
   <tabstop>importDeckButton</tabstop>
@@ -3466,6 +3480,8 @@
   <tabstop>saveEditorButton</tabstop>
   <tabstop>showAnswerButton</tabstop>
   <tabstop>help</tabstop>
+  <tabstop>noticeButton</tabstop>
+  <tabstop>welcomeText</tabstop>
  </tabstops>
  <resources>
   <include location="../icons.qrc"/>