diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 8d780aa237..dc5046e532 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -169,6 +169,8 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     m_param_label = new wxStaticText(this, wxID_ANY, _L("Select placeholder"));
     m_param_label->SetFont(wxGetApp().bold_font());
 
+    m_param_description = new wxStaticText(this, wxID_ANY, wxEmptyString);
+
     //Orca: use custom buttons
     auto btn_sizer = create_btn_sizer(wxOK | wxCANCEL);
     for(auto btn : m_button_list)
@@ -179,6 +181,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     topSizer->Add(label_top           , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(grid_sizer          , 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(m_param_label       , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
+    topSizer->Add(m_param_description , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(btn_sizer                , 0, wxEXPAND | wxALL, border);
 
     SetSizer(topSizer);
@@ -398,6 +401,7 @@ void EditGCodeDialog::bind_list_and_button()
 {
     m_params_list->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxDataViewEvent& evt) {
         wxString label;
+        wxString description;
 
         const std::string opt_key = m_params_list->GetSelectedParamKey();
         if (!opt_key.empty()) {
@@ -435,12 +439,17 @@ void EditGCodeDialog::bind_list_and_button()
                         (!cod->full_label.empty() && !cod->label.empty() ) ?
                         format_wxstr("%1% > %2%\n(%3%)", _(cod->full_label), _(cod->label), type_str) :
                         format_wxstr("%1%\n(%2%)", cod->label.empty() ? _(cod->full_label) : _(cod->label), type_str);
+
+                if (cod)
+                    description = _(cod->tooltip);
             }
             else
                 label = "Undef optptr";
         }
 
         m_param_label->SetLabel(label);
+        m_param_description->SetLabel(description);
+
         Layout();
     });
 
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index dcc1c6e5e4..0f87bcb931 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -30,6 +30,7 @@ class EditGCodeDialog : public DPIDialog
     ScalableButton*     m_add_btn       {nullptr};
     wxTextCtrl*         m_gcode_editor  {nullptr};
     wxStaticText*       m_param_label   {nullptr};
+    wxStaticText*       m_param_description {nullptr};
 
     DynamicConfig       m_read_write_config;
     DynamicConfig       m_universal_config;