diff --git a/boxflat/app.py b/boxflat/app.py
index 41799e1..183dd48 100644
--- a/boxflat/app.py
+++ b/boxflat/app.py
@@ -19,7 +19,6 @@
 class MainWindow(Adw.ApplicationWindow):
     def __init__(self, navigation: Adw.NavigationSplitView):
         super().__init__()
-        self.set_default_size(0, 850)
         self.set_title("Boxflat")
         self.set_content(navigation)
         self._data_path = None
@@ -206,12 +205,37 @@ def on_activate(self, app):
         if self.navigation.get_root() != None:
             return
 
+
         win = MainWindow(self.navigation)
         win.set_application(app)
         win.connect("close-request", lambda *_: Thread(target=self._show_bg_notification, daemon=True).start())
+        win.connect("close-request", self._save_window_info)
+
         win.present()
         win.check_udev(self._data_path)
 
+        saved_state = self._settings.read_setting("window_state")
+
+        if not saved_state:
+            win.set_default_size(0, 850)
+            return
+
+        win.set_default_size(saved_state["width"], saved_state["height"])
+        if saved_state["maximized"]:
+            win.maximize()
+
+        if saved_state["fullscreen"]:
+            win.fullscreen()
+
+
+    def _save_window_info(self, window: Adw.ApplicationWindow) -> None:
+        self._settings.write_setting({
+            "width"      : window.get_default_size().width,
+            "height"     : window.get_default_size().height,
+            "maximized"  : window.is_maximized(),
+            "fullscreen" : window.is_fullscreen()
+        }, "window_state")
+
 
     def _show_bg_notification(self, *_) -> None:
         if self._settings.read_setting("background-notified") == 1:
diff --git a/data/version b/data/version
index 9478670..fa3c808 100644
--- a/data/version
+++ b/data/version
@@ -1 +1 @@
-v1.25.1
+v1.25.2
diff --git a/io.github.lawstorant.boxflat.metainfo.xml b/io.github.lawstorant.boxflat.metainfo.xml
index b74f42c..5d9765d 100644
--- a/io.github.lawstorant.boxflat.metainfo.xml
+++ b/io.github.lawstorant.boxflat.metainfo.xml
@@ -100,6 +100,11 @@
   <update_contact>forest10pl@gmail.com</update_contact>
 
   <releases>
+    <release version="v1.25.2" date="2024-11-13">
+      <description>
+        <p>Save window size when closed</p>
+      </description>
+    </release>
     <release version="v1.25.1" date="2024-11-13">
       <description>
         <p>Keep the linked process while overwriting a preset</p>