diff --git a/artiq/gui/experiments.py b/artiq/gui/experiments.py
index b7a019b4c..60c6e5da8 100644
--- a/artiq/gui/experiments.py
+++ b/artiq/gui/experiments.py
@@ -299,10 +299,14 @@ class _ExperimentDock(QtWidgets.QMdiSubWindow):
         QtWidgets.QMdiSubWindow.closeEvent(self, event)
 
     def save_state(self):
-        return self.argeditor.save_state()
+        return {
+            "args": self.argeditor.save_state(),
+            "geometry": bytes(self.saveGeometry())
+        }
 
     def restore_state(self, state):
-        self.argeditor.restore_state(state)
+        self.argeditor.restore_state(state["args"])
+        self.restoreGeometry(QtCore.QByteArray(state["geometry"]))
 
 
 class ExperimentManager: