diff --git a/ChangeLog b/ChangeLog
index 407e391d3..c95340eda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-07	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/gui/main_window.cpp:
+	set QMdiArea::DontMaximizeSubWindowOnActivation option for not
+	crashing when loading project while a subwindow is maximized (this
+	looks like a bug in Qt) (closes #2077774)
+
 	* src/gui/controller_connection_dialog.cpp:
 	fixed crash when closing controller select dialog and no controller
 	has been selected (closes #2078357)
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index ec7af69cf..fa86bb676 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -132,6 +132,7 @@ mainWindow::mainWindow( void ) :
 
 	m_workspace = new QMdiArea( splitter );
 	m_workspace->setBackground( Qt::NoBrush );
+	m_workspace->setOption( QMdiArea::DontMaximizeSubWindowOnActivation );
 	m_workspace->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
 	m_workspace->setVerticalScrollBarPolicy( Qt::ScrollBarAsNeeded );