diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc
index 36340f7a6..7782de87c 100644
--- a/rtgui/editwindow.cc
+++ b/rtgui/editwindow.cc
@@ -73,7 +73,7 @@ EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false)
     set_resizable(true);
 
     property_destroy_with_parent().set_value(false);
-    signal_window_state_event().connect( sigc::mem_fun(*this, &EditWindow::on_window_state_event) );
+    //signal_window_state_event().connect( sigc::mem_fun(*this, &EditWindow::on_window_state_event) );
 
     mainNB = Gtk::manage (new Gtk::Notebook ());
     mainNB->set_scrollable (true);
@@ -95,18 +95,16 @@ void EditWindow::on_realize ()
     editWindowCursorManager.init (get_window());
 }
 
+/*  HOMBRE: Disabling this since it's maximized when opened anyway.
+ *  Someday, the EditorWindow migh save it own position and state, so it'll have to be uncommented
 bool EditWindow::on_window_state_event(GdkEventWindowState* event)
 {
-    if (!event->new_window_state) {
-        // Window mode
-        options.windowMaximized = false;
-    } else if (event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) {
-        // Fullscreen mode
-        options.windowMaximized = true;
+    if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
+        options.windowMaximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
     }
 
-    return true;
-}
+    return Gtk::Widget::on_window_state_event(event);
+}*/
 
 void EditWindow::on_mainNB_switch_page(Gtk::Widget* widget, guint page_num)
 {
diff --git a/rtgui/editwindow.h b/rtgui/editwindow.h
index e5b0e8afb..320b47b40 100644
--- a/rtgui/editwindow.h
+++ b/rtgui/editwindow.h
@@ -50,7 +50,7 @@ public:
 
     bool keyPressed (GdkEventKey* event);
     bool on_delete_event(GdkEventAny* event);
-    bool on_window_state_event(GdkEventWindowState* event);
+    //bool on_window_state_event(GdkEventWindowState* event);
     void on_mainNB_switch_page(Gtk::Widget* page, guint page_num);
     void set_title_decorated(Glib::ustring fname);
 
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index 567739791..a94fafa36 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -131,7 +131,6 @@ RTWindow::RTWindow ()
 
     if (options.windowMaximized) {
         maximize();
-        //get_style_context()->add_class("maximized");
     } else {
         unmaximize();
         move(options.windowX, options.windowY);