diff --git a/ankiqt/config.py b/ankiqt/config.py
index d7c8b172e..f8de29d4f 100644
--- a/ankiqt/config.py
+++ b/ankiqt/config.py
@@ -43,8 +43,7 @@ class Config(dict):
             'saveAfterAdding': True,
             'saveAfterAddingNum': 3,
             'saveOnClose': True,
-            'mainWindowSize': QSize(450, 400),
-            'mainWindowPos': QPoint(100, 100),
+            'mainWindowGeom': None,
             'easeButtonHeight': 'standard',
             'suppressUpdate': False,
             'suppressEstimates': False,
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 939ef87c3..24f967410 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -47,9 +47,8 @@ class AnkiQt(QMainWindow):
         self.help = ui.help.HelpArea(self.mainWin.helpFrame, self.config, self)
 	self.trayIcon = ui.tray.AnkiTrayIcon( self )
         self.connectMenuActions()
-        self.resize(self.config['mainWindowSize'])
-        self.move(self.config['mainWindowPos'])
-        self.maybeMoveWindow()
+        if self.config['mainWindowGeom']:
+            self.restoreGeometry(self.config['mainWindowGeom'])
         self.bodyView = ui.view.View(self, self.mainWin.mainText,
                                      self.mainWin.mainTextFrame)
         self.addView(self.bodyView)
@@ -78,24 +77,6 @@ class AnkiQt(QMainWindow):
         # check for updates
         self.setupAutoUpdate()
 
-    def maybeMoveWindow(self):
-        # If the window is positioned off the screen, move it back into view
-        moveWin = False
-        if (self.pos().x() > (self.app.desktop().width() - 200) or
-            self.pos().x() < 0):
-            moveWin = True
-            newX = self.app.desktop().width() - self.size().width()
-        else:
-            newX = self.pos().x()
-        if (self.pos().y() > (self.app.desktop().height() - 200) or
-            self.pos().y() < 0):
-            moveWin = True
-            newY = self.app.desktop().height() - self.size().height()
-        else:
-            newY = self.pos().y()
-        if moveWin:
-            self.move( newX, newY )
-
     # State machine
     ##########################################################################
 
@@ -741,8 +722,7 @@ class AnkiQt(QMainWindow):
         "Save config and window geometry."
         self.runHook('quit')
         self.help.hide()
-        self.config['mainWindowPos'] = self.pos()
-        self.config['mainWindowSize'] = self.size()
+        self.config['mainWindowGeom'] = self.saveGeometry()
         # save config
         try:
             self.config.save()