diff --git a/Configuration.cpp b/Configuration.cpp
index cf3798516..85a5b6cad 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1082,8 +1082,7 @@ void Configuration::impl::done (int r)
 {
   // do this here since window is still on screen at this point
   SettingsGroup g {settings_, "Configuration"};
-  settings_->setValue ("window/size", size ());
-  settings_->setValue ("window/pos", pos ());
+  settings_->setValue ("window/geometry", saveGeometry ());
 
   QDialog::done (r);
 }
@@ -1091,9 +1090,7 @@ void Configuration::impl::done (int r)
 void Configuration::impl::read_settings ()
 {
   SettingsGroup g {settings_, "Configuration"};
-
-  resize (settings_->value ("window/size", size ()).toSize ());
-  move (settings_->value ("window/pos", pos ()).toPoint ());
+  restoreGeometry (settings_->value ("window/geometry").toByteArray ());
 
   my_callsign_ = settings_->value ("MyCall", "").toString ();
   my_grid_ = settings_->value ("MyGrid", "").toString ();
diff --git a/messageaveraging.cpp b/messageaveraging.cpp
index 0518f6aa6..9cc2969a4 100644
--- a/messageaveraging.cpp
+++ b/messageaveraging.cpp
@@ -28,14 +28,14 @@ void MessageAveraging::closeEvent (QCloseEvent * e)
 void MessageAveraging::read_settings ()
 {
   settings_->beginGroup ("MessageAveraging");
-  move (settings_->value ("window/pos", pos ()).toPoint ());
+  restoreGeometry (settings_->value ("window/geometry").toByteArray ());
   settings_->endGroup ();
 }
 
 void MessageAveraging::write_settings ()
 {
   settings_->beginGroup ("MessageAveraging");
-  settings_->setValue ("window/pos", pos ());
+  settings_->setValue ("window/geometry", saveGeometry ());
   settings_->endGroup ();
 }