diff --git a/ankiqt/ui/clayout.py b/ankiqt/ui/clayout.py
index 6ebd554ae..c3ca7b09d 100644
--- a/ankiqt/ui/clayout.py
+++ b/ankiqt/ui/clayout.py
@@ -48,9 +48,8 @@ class CardLayout(QDialog):
                 return
         self.form = ankiqt.forms.clayout.Ui_Dialog()
         self.form.setupUi(self)
-        # self.connect(self.form.helpButton, SIGNAL("clicked()"),
-        #              self.onHelp)
-
+        self.connect(self.form.buttonBox, SIGNAL("helpRequested()"),
+                     self.onHelp)
         self.setupCards()
         self.setupFields()
         restoreGeom(self, "CardLayout")
@@ -285,7 +284,7 @@ order by n""", id=card.id)
 
     def onHelp(self):
         QDesktopServices.openUrl(QUrl(ankiqt.appWiki +
-                                      "DisplayProperties"))
+                                      "CardLayout"))
 
     # Fields
     ##########################################################################
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 9002220ea..16bec7b87 100755
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -1475,6 +1475,7 @@ later by using File>Close.
         self.mainWin.buttonStack.hide()
         self.switchToEditScreen()
         self.editor.setFact(self.currentCard.fact)
+        self.editor.card = self.currentCard
 
     def onFactValid(self, fact):
         self.mainWin.saveEditorButton.setEnabled(True)
diff --git a/tools/build_ui.sh b/tools/build_ui.sh
index b7531555a..a597d71a0 100755
--- a/tools/build_ui.sh
+++ b/tools/build_ui.sh
@@ -68,7 +68,8 @@ cat $temp >> $init
 rm $temp
 
 # use older integer format so qt4.4 still works
-#sed -i 's/setProperty("value", 14)/setProperty("value", QtCore.QVariant(14))/' ankiqt/forms/displayproperties.py
+sed -i 's/setProperty("value", 14)/setProperty("value", QtCore.QVariant(14))/' \
+  ankiqt/forms/clayout.py
 
 echo "Building resources.."
 $pyrcc icons.qrc -o icons_rc.py