diff --git a/zenmap/share/zenmap/config/zenmap.conf b/zenmap/share/zenmap/config/zenmap.conf
index 51829599c..a282ef32a 100644
--- a/zenmap/share/zenmap/config/zenmap.conf
+++ b/zenmap/share/zenmap/config/zenmap.conf
@@ -76,3 +76,8 @@ store_results = 1
 directory = 
 save_time = 60;days
 
+[window]
+x = 0
+y = 0
+width = -1
+height = 650
diff --git a/zenmap/zenmapCore/UmitConf.py b/zenmap/zenmapCore/UmitConf.py
index 92ffb669f..836a7aec3 100644
--- a/zenmap/zenmapCore/UmitConf.py
+++ b/zenmap/zenmapCore/UmitConf.py
@@ -306,6 +306,89 @@ class Profile(UmitConfigParser, object):
         return True
 
 
+class WindowConfig(UmitConfigParser, object):
+    section_name = "window"
+
+    default_x = 0
+    default_y = 0
+    default_width = -1
+    default_height = 650
+
+    def __init__(self):
+        if not config_parser.has_section(self.section_name):
+            self.create_section()
+
+    def save_changes(self):
+        config_parser.fp = open(Path.user_config_file, 'w')
+        config_parser.save_changes()
+
+    def create_section(self):
+        config_parser.add_section(self.section_name)
+        self.x = self.default_x
+        self.y = self.default_y
+        self.width = self.default_width
+        self.height = self.default_height
+
+    def _get_it(self, p_name, default):
+        return config_parser.get(self.section_name, p_name, default)
+
+    def _set_it(self, p_name, value):
+        config_parser.set(self.section_name, p_name, value)
+
+    def get_x(self):
+        try:
+            value = int(self._get_it("x", self.default_x))
+        except ValueError:
+            value = self.default_x
+        return value
+
+    def set_x(self, x):
+        self._set_it("x", x)
+
+    def get_y(self):
+        try:
+            value = int(self._get_it("y", self.default_y))
+        except ValueError:
+            value = self.default_y
+        return value
+
+    def set_y(self, y):
+        self._set_it("y", y)
+
+    def get_width(self):
+        try:
+            value = int(self._get_it("width", self.default_width))
+        except ValueError:
+            value = self.default_width
+
+        if not (value >= -1):
+            value = self.default_width
+
+        return value
+
+    def set_width(self, width):
+        self._set_it("width", width)
+
+    def get_height(self):
+        try:
+            value = int(self._get_it("height", self.default_height))
+        except ValueError:
+            value = self.default_height
+
+        if not (value >= -1):
+            value = self.default_height
+
+        return value
+
+    def set_height(self, height):
+        self._set_it("height", height)
+
+    x = property(get_x, set_x)
+    y = property(get_y, set_y)
+    width = property(get_width, set_width)
+    height = property(get_height, set_height)
+
+
 class CommandProfile (Profile, object):
     """This class is a wrapper around Profile that provides accessors for the
     attributes of a profile: command and description"""
diff --git a/zenmap/zenmapGUI/MainWindow.py b/zenmap/zenmapGUI/MainWindow.py
index 2ba6b9cf5..e25a7b965 100644
--- a/zenmap/zenmapGUI/MainWindow.py
+++ b/zenmap/zenmapGUI/MainWindow.py
@@ -155,7 +155,7 @@ from zenmapCore.RecentScans import recent_scans
 from zenmapCore.UmitLogging import log
 import zenmapCore.I18N
 import zenmapGUI.Print
-from zenmapCore.UmitConf import SearchConfig, is_maemo
+from zenmapCore.UmitConf import SearchConfig, is_maemo, WindowConfig
 from zenmapCore.NetworkInventory import FilteredNetworkInventory
 
 UmitScanWindow = None
@@ -194,8 +194,12 @@ def can_print():
 class ScanWindow(UmitScanWindow):
     def __init__(self):
         UmitScanWindow.__init__(self)
+
+        window = WindowConfig()
+
         self.set_title(_(APP_DISPLAY_NAME))
-        self.set_default_size(-1, 650)
+        self.move(window.x, window.y)
+        self.set_default_size(window.width, window.height)
 
         self.scan_interface = ScanInterface()
 
@@ -901,6 +905,11 @@ This scan has not been run yet. Start the scan with the "Scan" button first.'))
             elif response == gtk.RESPONSE_CANCEL:
                 return True
 
+        window = WindowConfig()
+        window.x, window.y = self.get_position()
+        window.width, window.height = self.get_size()
+        window.save_changes()
+
         self.destroy()
 
         return False