diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
index b91efdfc38..e2c89e49b5 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
@@ -270,6 +270,7 @@ void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties()
     m_LastSelected3DShapeIndex = -1;
 
     // Init 3D shape list
+    m_3D_ShapeNameListBox->Clear();
     S3D_MASTER* draw3D = m_CurrentModule->Models();
     wxString origPath;
     wxString alias;
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h
index ad5146f73d..5f10d41ec4 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h
@@ -99,7 +99,6 @@ private:
 
         // Now all widgets have the size fixed, call FinishDialogSettings
         FinishDialogSettings();
-        event.Skip();
     }
 
     bool TransferDataToWindow();
diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
index 4ad960c33c..88beb93ba4 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
@@ -122,6 +122,7 @@ void DIALOG_MODULE_MODULE_EDITOR::initModeditProperties()
     m_lastSelected3DShapeIndex = -1;
 
     // Init 3D shape list
+    m_3D_ShapeNameListBox->Clear();
     S3D_MASTER* draw3D = m_currentModule->Models();
     wxString origPath;
     wxString alias;
diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit.h
index 86671b2b62..b28fefd11d 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.h
+++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.h
@@ -83,7 +83,6 @@ private:
 
         // Now all widgets have the size fixed, call FinishDialogSettings
         FinishDialogSettings();
-        event.Skip();
     }
 };
 
diff --git a/pcbnew/dialogs/dialog_print_for_modedit.cpp b/pcbnew/dialogs/dialog_print_for_modedit.cpp
index ae221d8162..d2239b2b4d 100644
--- a/pcbnew/dialogs/dialog_print_for_modedit.cpp
+++ b/pcbnew/dialogs/dialog_print_for_modedit.cpp
@@ -78,7 +78,6 @@ private:
 
         // Now all widgets have the size fixed, call FinishDialogSettings
         FinishDialogSettings();
-        event.Skip();
     }
 
     void InitValues( );
diff --git a/pcbnew/dialogs/dialog_print_using_printer.cpp b/pcbnew/dialogs/dialog_print_using_printer.cpp
index c89ea31b9b..86bcb0040c 100644
--- a/pcbnew/dialogs/dialog_print_using_printer.cpp
+++ b/pcbnew/dialogs/dialog_print_using_printer.cpp
@@ -101,7 +101,6 @@ private:
 
         // Now all widgets have the size fixed, call FinishDialogSettings
         FinishDialogSettings();
-        event.Skip();
     }
 
     void SetPrintParameters( );