diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp
index d875323ca..0461fdb56 100644
--- a/src/slic3r/GUI/PrintOptionsDialog.cpp
+++ b/src/slic3r/GUI/PrintOptionsDialog.cpp
@@ -589,10 +589,17 @@ bool PrinterPartsDialog::Show(bool show)
         nozzle_diameter_checkbox->Clear();
 
         if (type.empty()) {
+            nozzle_type_checkbox->SetValue(wxEmptyString);
+            nozzle_diameter_checkbox->SetValue(wxEmptyString);
+
             nozzle_type_checkbox->Disable();
             nozzle_diameter_checkbox->Disable();
             return DPIDialog::Show(show);
         }
+        else {
+            nozzle_type_checkbox->Enable();
+            nozzle_diameter_checkbox->Enable();
+        }
 
         last_nozzle_type = type;