diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 8424dae05..2d8bfea4b 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -20,7 +20,7 @@ from anki.db import OperationalError
 from anki.stdmodels import BasicModel
 from anki.hooks import runHook, addHook, removeHook, _hooks
 from anki.deck import newCardOrderLabels, newCardSchedulingLabels
-from anki.deck import revCardOrderLabels
+from anki.deck import revCardOrderLabels, failedCardOptionLabels
 import anki.latex
 import anki.lang
 import anki.deck
@@ -986,6 +986,8 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
             0, QStringList(newCardSchedulingLabels().values()))
         self.mainWin.revCardOrder.insertItems(
             0, QStringList(revCardOrderLabels().values()))
+        self.mainWin.failedCardsOption.insertItems(
+            0, QStringList(failedCardOptionLabels().values()))
         self.connect(self.mainWin.optionsHelpButton,
                      SIGNAL("clicked()"),
                      lambda: QDesktopServices.openUrl(QUrl(
@@ -1110,7 +1112,7 @@ day = :d""", d=yesterday)
         self.mainWin.newCardOrder.setCurrentIndex(self.deck.newCardOrder)
         self.mainWin.newCardScheduling.setCurrentIndex(self.deck.newCardSpacing)
         self.mainWin.revCardOrder.setCurrentIndex(self.deck.revCardOrder)
-        self.mainWin.delayLapsedCards.setChecked(not self.deck.delay0)
+        self.mainWin.failedCardsOption.setCurrentIndex(self.deck.getFailedCardPolicy())
 
     def onStartReview(self):
         self.mainWin.studyOptionsFrame.hide()
@@ -1125,12 +1127,7 @@ day = :d""", d=yesterday)
         self.deck.newCardOrder = self.mainWin.newCardOrder.currentIndex()
         self.deck.newCardSpacing = self.mainWin.newCardScheduling.currentIndex()
         self.deck.revCardOrder = self.mainWin.revCardOrder.currentIndex()
-        # avoid clobbering the user's settings if they haven't changed
-        if self.deck.delay0 and self.mainWin.delayLapsedCards.isChecked():
-            self.deck.delay0 = 0
-        elif (not self.deck.delay0 and
-              not self.mainWin.delayLapsedCards.isChecked()):
-            self.deck.delay0 = 600
+        self.deck.setFailedCardPolicy(self.mainWin.failedCardsOption.currentIndex())
         self.deck.updateDynamicIndices()
         self.deck.startSession()
         self.deck.flushMod()
diff --git a/designer/main.ui b/designer/main.ui
index c4fca4ed9..9f86f874b 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>639</width>
-    <height>501</height>
+    <height>504</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -28,7 +28,7 @@
      <x>0</x>
      <y>69</y>
      <width>639</width>
-     <height>412</height>
+     <height>415</height>
     </rect>
    </property>
    <property name="sizePolicy" >
@@ -405,7 +405,7 @@
             <x>0</x>
             <y>0</y>
             <width>368</width>
-            <height>355</height>
+            <height>358</height>
            </rect>
           </property>
          </widget>
@@ -477,8 +477,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>474</width>
-            <height>356</height>
+            <width>368</width>
+            <height>358</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_4" >
@@ -741,11 +741,7 @@
                         </widget>
                        </item>
                        <item>
-                        <widget class="QCheckBox" name="delayLapsedCards" >
-                         <property name="text" >
-                          <string>Show failed cards last</string>
-                         </property>
-                        </widget>
+                        <widget class="QComboBox" name="failedCardsOption" />
                        </item>
                       </layout>
                      </widget>
@@ -842,8 +838,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>474</width>
-            <height>356</height>
+            <width>368</width>
+            <height>358</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_8" >
@@ -1341,7 +1337,7 @@
    <property name="geometry" >
     <rect>
      <x>0</x>
-     <y>481</y>
+     <y>484</y>
      <width>639</width>
      <height>20</height>
     </rect>