diff --git a/change_log.txt b/change_log.txt
index c7502fe323..503f8e6f24 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -5,6 +5,12 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2008-Sep-17 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
+================================================================================
++pcbnew:
+    Fixed a bug in modedit which crashes pcbnew when closing the properties module dialog
+    Both in trunk and tagged versions
+
 
 2008-Sep-17 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
diff --git a/pcbnew/dialog_edit_module.cpp b/pcbnew/dialog_edit_module.cpp
index df477364c7..48fedd3e67 100644
--- a/pcbnew/dialog_edit_module.cpp
+++ b/pcbnew/dialog_edit_module.cpp
@@ -168,8 +168,6 @@ void WinEDA_ModulePropertiesFrame::BuildPanelModuleProperties( bool FullOptions
     wxBoxSizer*   PropLeftSizer;
     wxBoxSizer*   PropRightSizer;
     wxString      msg;
-    wxStaticText*  XPositionStatic = new wxStaticText(m_PanelProperties, -1, _("X"));
-    wxStaticText*  YPositionStatic = new wxStaticText(m_PanelProperties, -1, _("Y"));
 
     m_ModPositionX = NULL;
     m_ModPositionY = NULL;
@@ -183,6 +181,8 @@ void WinEDA_ModulePropertiesFrame::BuildPanelModuleProperties( bool FullOptions
 
     if( FullOptions )  // Module is on a board
     {
+        wxStaticText*  XPositionStatic = new wxStaticText(m_PanelProperties, -1, _("X"));
+        wxStaticText*  YPositionStatic = new wxStaticText(m_PanelProperties, -1, _("Y"));
         Button = new wxButton( m_PanelProperties, ID_MODULE_PROPERTIES_EXCHANGE,
                               _( "Change module(s)" ) );
         Button->SetForegroundColour( wxColor( 80, 40, 0 ) );