3 files changed, 22 insertions, 2 deletions
diff --git a/data/ui/options_dialog.ui b/data/ui/options_dialog.ui
index 19100cde..bcdb7a44 100644
--- a/data/ui/options_dialog.ui
+++ b/data/ui/options_dialog.ui
@@ -39,9 +39,9 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-511</y>
+            <y>-555</y>
             <width>394</width>
-            <height>850</height>
+            <height>872</height>
            </rect>
           </property>
           <layout class="QFormLayout" name="formLayout">
@@ -573,6 +573,23 @@
              </property>
             </widget>
            </item>
+           <item row="34" column="1">
+            <widget class="QCheckBox" name="restoreposition_cb">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="34" column="0">
+            <widget class="QLabel" name="restoreposition_lbl">
+             <property name="toolTip">
+              <string>If ticked, some windows restore their last known position where they were closed.</string>
+             </property>
+             <property name="text">
+              <string>Restore Window Position</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>
diff --git a/src/widgets/aooptionsdialog.cpp b/src/widgets/aooptionsdialog.cpp
index 704e407f..db3c8788 100644
--- a/src/widgets/aooptionsdialog.cpp
+++ b/src/widgets/aooptionsdialog.cpp
@@ -359,6 +359,7 @@ void AOOptionsDialog::setupUI()
   FROM_UI(QCheckBox, sfx_on_idle_cb);
   FROM_UI(QCheckBox, evidence_double_click_cb);
   FROM_UI(QCheckBox, slides_cb);
+  FROM_UI(QCheckBox, restoreposition_cb);
 
   registerOption<QSpinBox, int>("theme_scaling_factor_sb", &Options::themeScalingFactor, &Options::setThemeScalingFactor);
   registerOption<QCheckBox, bool>("animated_theme_cb", &Options::animatedThemeEnabled, &Options::setAnimatedThemeEnabled);
@@ -402,6 +403,7 @@ void AOOptionsDialog::setupUI()
   registerOption<QCheckBox, bool>("sfx_on_idle_cb", &Options::playSelectedSFXOnIdle, &Options::setPlaySelectedSFXOnIdle);
   registerOption<QCheckBox, bool>("evidence_double_click_cb", &Options::evidenceDoubleClickEdit, &Options::setEvidenceDoubleClickEdit);
   registerOption<QCheckBox, bool>("slides_cb", &Options::slidesEnabled, &Options::setSlidesEnabled);
+  registerOption<QCheckBox, bool>("restoreposition_cb", &Options::restoreWindowPositionEnabled, &Options::setRestoreWindowPositionEnabled);
 
   // Callwords tab. This could just be a QLineEdit, but no, we decided to allow
   // people to put a billion entries in.
diff --git a/src/widgets/aooptionsdialog.h b/src/widgets/aooptionsdialog.h
index b16be331..eb64a539 100644
--- a/src/widgets/aooptionsdialog.h
+++ b/src/widgets/aooptionsdialog.h
@@ -48,6 +48,7 @@ private:
   QPushButton *ui_theme_folder_button;
   QCheckBox *ui_evidence_double_click_cb;
   QCheckBox *ui_slides_cb;
+  QCheckBox *ui_restoreposition_cb;
   QCheckBox *ui_animated_theme_cb;
   QSpinBox *ui_stay_time_spinbox;
   QCheckBox *ui_instant_objection_cb;