diff --git a/ankiqt/ui/deckproperties.py b/ankiqt/ui/deckproperties.py
index 53d49b2b9..d5cd6ae88 100644
--- a/ankiqt/ui/deckproperties.py
+++ b/ankiqt/ui/deckproperties.py
@@ -28,6 +28,8 @@ class DeckProperties(QDialog):
         self.origMod = self.d.modified
         self.dialog = ankiqt.forms.deckproperties.Ui_DeckProperties()
         self.dialog.setupUi(self)
+        self.dialog.buttonBox.button(QDialogButtonBox.Help).setAutoDefault(False)
+        self.dialog.buttonBox.button(QDialogButtonBox.Close).setAutoDefault(False)
         self.readData()
         self.connect(self.dialog.modelsAdd, SIGNAL("clicked()"), self.onAdd)
         self.connect(self.dialog.modelsEdit, SIGNAL("clicked()"), self.onEdit)
diff --git a/designer/deckproperties.ui b/designer/deckproperties.ui
index c27cbd9d4..b54b2a947 100644
--- a/designer/deckproperties.ui
+++ b/designer/deckproperties.ui
@@ -25,14 +25,6 @@
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab_2" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>410</width>
-        <height>334</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Models &amp;&amp; Priorities</string>
       </attribute>
@@ -139,6 +131,9 @@
            <property name="text" >
             <string>&amp;Add</string>
            </property>
+           <property name="autoDefault" >
+            <bool>false</bool>
+           </property>
           </widget>
          </item>
          <item>
@@ -146,6 +141,9 @@
            <property name="text" >
             <string>&amp;Edit</string>
            </property>
+           <property name="autoDefault" >
+            <bool>false</bool>
+           </property>
           </widget>
          </item>
          <item>
@@ -153,6 +151,9 @@
            <property name="text" >
             <string>&amp;Delete</string>
            </property>
+           <property name="autoDefault" >
+            <bool>false</bool>
+           </property>
           </widget>
          </item>
         </layout>
@@ -160,14 +161,6 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tab_5" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>375</width>
-        <height>334</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Synchronisation</string>
       </attribute>
@@ -300,14 +293,6 @@ p, li { white-space: pre-wrap; }
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>346</width>
-        <height>356</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Advanced</string>
       </attribute>