diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp
index 70fa430775..058d3ece5a 100644
--- a/src/slic3r/GUI/WipeTowerDialog.cpp
+++ b/src/slic3r/GUI/WipeTowerDialog.cpp
@@ -581,18 +581,21 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector<float>& matrix, con
 
         auto on_apply_text_modify = [this](wxEvent& e) {
             wxString str = m_flush_multiplier_ebox->GetValue();
-            float      multiplier = wxAtof(str);
-            if (multiplier < g_min_flush_multiplier || multiplier > g_max_flush_multiplier) {
-                str = wxString::Format(("%.2f"), multiplier < g_min_flush_multiplier ? g_min_flush_multiplier : g_max_flush_multiplier);
-                m_flush_multiplier_ebox->SetValue(str);
-                MessageDialog dlg(nullptr,
-                    wxString::Format(_L("The multiplier should be in range [%.2f, %.2f]."), g_min_flush_multiplier, g_max_flush_multiplier),
-                    _L("Warning"), wxICON_WARNING | wxOK);
-                dlg.ShowModal();
-            }
-            for (unsigned int i = 0; i < m_number_of_extruders; ++i) {
-                for (unsigned int j = 0; j < m_number_of_extruders; ++j) {
-                    edit_boxes[i][j]->SetValue(to_string(int(m_matrix[m_number_of_extruders * j + i] * multiplier)));
+            str.Replace(",", ".");
+            double  multiplier = 1.f;
+            if (str.ToDouble(&multiplier)) {
+                if (multiplier < g_min_flush_multiplier || multiplier > g_max_flush_multiplier) {
+                    str = wxString::Format(("%.2f"), multiplier < g_min_flush_multiplier ? g_min_flush_multiplier : g_max_flush_multiplier);
+                    m_flush_multiplier_ebox->SetValue(str);
+                    MessageDialog dlg(nullptr,
+                        wxString::Format(_L("The multiplier should be in range [%.2f, %.2f]."), g_min_flush_multiplier, g_max_flush_multiplier),
+                        _L("Warning"), wxICON_WARNING | wxOK);
+                    dlg.ShowModal();
+                }
+                for (unsigned int i = 0; i < m_number_of_extruders; ++i) {
+                    for (unsigned int j = 0; j < m_number_of_extruders; ++j) {
+                        edit_boxes[i][j]->SetValue(to_string(int(m_matrix[m_number_of_extruders * j + i] * multiplier)));
+                    }
                 }
             }
 
@@ -610,12 +613,25 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector<float>& matrix, con
         char flush_multi_str[32] = { 0 };
         snprintf(flush_multi_str, sizeof(flush_multi_str), "%.2f", flush_multiplier);
         m_flush_multiplier_ebox->SetValue(flush_multi_str);
+        m_flush_multiplier_ebox->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
         param_sizer->Add(m_flush_multiplier_ebox, 0, wxALIGN_CENTER | wxALL, 0);
         param_sizer->AddStretchSpacer(1);
         m_sizer_advanced->Add(param_sizer, 0, wxEXPAND | wxLEFT, TEXT_BEG_PADDING);
 
         m_flush_multiplier_ebox->Bind(wxEVT_TEXT_ENTER, on_apply_text_modify);
         m_flush_multiplier_ebox->Bind(wxEVT_KILL_FOCUS, on_apply_text_modify);
+        m_flush_multiplier_ebox->Bind(wxEVT_COMMAND_TEXT_UPDATED, [this](wxCommandEvent&) {
+            wxString str = m_flush_multiplier_ebox->GetValue();
+            str.Replace(",", ".");
+            double multiplier = 1.f;
+            if (str.ToDouble(&multiplier)) {
+                if (multiplier < g_min_flush_multiplier || multiplier > g_max_flush_multiplier) {
+                    str = wxString::Format(("%.2f"), multiplier < g_min_flush_multiplier ? g_min_flush_multiplier : g_max_flush_multiplier);
+                    m_flush_multiplier_ebox->SetValue(str);
+                }
+            }
+            m_flush_multiplier_ebox->SetInsertionPointEnd();
+        });
     }
     this->update_warning_texts();
 
diff --git a/src/slic3r/GUI/WipeTowerDialog.hpp b/src/slic3r/GUI/WipeTowerDialog.hpp
index b436b7b979..faa005c8b3 100644
--- a/src/slic3r/GUI/WipeTowerDialog.hpp
+++ b/src/slic3r/GUI/WipeTowerDialog.hpp
@@ -61,7 +61,12 @@ public:
         if (m_flush_multiplier_ebox == nullptr)
             return 1.f;
 
-        return std::atof(m_flush_multiplier_ebox->GetValue().c_str());
+        wxString str = m_flush_multiplier_ebox->GetValue();
+        str.Replace(",", ".");
+        double multiplier = 1.f;
+        str.ToDouble(&multiplier);
+
+        return multiplier;
     }
 
 private: