diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 832db5ecf0f..e521b2bc08f 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -5223,27 +5223,21 @@ TimestampsConfigDef::TimestampsConfigDef()
 
     def = this->add("year", coInt);
     def->label = L("Year");
-    def->tooltip = L("");
 
     def = this->add("month", coInt);
     def->label = L("Month");
-    def->tooltip = L("");
 
     def = this->add("day", coInt);
     def->label = L("Day");
-    def->tooltip = L("");
 
     def = this->add("hour", coInt);
     def->label = L("Hour");
-    def->tooltip = L("");
 
     def = this->add("minute", coInt);
     def->label = L("Minute");
-    def->tooltip = L("");
 
     def = this->add("second", coInt);
     def->label = L("Second");
-    def->tooltip = L("");
 }
 
 OtherPresetsConfigDef::OtherPresetsConfigDef()
@@ -5259,17 +5253,17 @@ OtherPresetsConfigDef::OtherPresetsConfigDef()
     def->tooltip = L("Name of the print preset used for slicing.");
 
     def = this->add("filament_preset", coString);
-    def->label = L("");
+    def->label = L("Filament preset name");
     def->tooltip = L("Names of the filament presets used for slicing. The variable is a vector "
                      "containing one name for each extruder.");
 
     def = this->add("printer_preset", coString);
-    def->label = L("");
+    def->label = L("Printer preset name");
     def->tooltip = L("Name of the printer preset used for slicing.");
 
     def = this->add("physical_printer_preset", coString);
-    def->label = L("");
-    def->tooltip = L("Name of the physical print preset used for slicing.");
+    def->label = L("Physical printer name");
+    def->tooltip = L("Name of the physical printer used for slicing.");
 }
 
 
diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 413c524a491..26ad5e827f4 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -286,7 +286,7 @@ void EditGCodeDialog::bind_list_and_button()
                         format_wxstr("%1%\n(%2%)", def->label.empty() ? _(def->full_label) : _(def->label), type_str);
 
                 if (def)
-                    description = _(def->tooltip);
+                    description = get_wraped_wxString(_(def->tooltip), 120);
             }
             else
                 label = "Undef optptr";