diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp
index e4dc64dcd6..f489ba6c28 100644
--- a/src/slic3r/GUI/MediaFilePanel.cpp
+++ b/src/slic3r/GUI/MediaFilePanel.cpp
@@ -456,7 +456,7 @@ struct MediaProgressDialog : ProgressDialog
     std::function<void()> m_cancel;
 };
 
-void Slic3r::GUI::MediaFilePanel::doAction(size_t index, int action)
+void MediaFilePanel::doAction(size_t index, int action)
 {
     auto fs = m_image_grid->GetFileSystem();
     if (action == 0) {
@@ -502,8 +502,8 @@ void Slic3r::GUI::MediaFilePanel::doAction(size_t index, int action)
                     Slic3r::GUI::wxGetApp().plater()->update_print_required_data(config, model, plate_data_list, from_u8(file.name).ToStdString());
                     wxPostEvent(Slic3r::GUI::wxGetApp().plater(), SimpleEvent(EVT_PRINT_FROM_SDCARD_VIEW));
                 });
+                return;
             }
-            return;
         }
         if (index != -1) {
             auto &file = fs->GetFile(index);
diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp
index 96f4d6b909..1ba91ddf7d 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.cpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.cpp
@@ -68,6 +68,8 @@ int ComboBox::GetSelection() const { return drop.GetSelection(); }
 
 void ComboBox::SetSelection(int n)
 {
+    if (n == drop.selection)
+        return;
     drop.SetSelection(n);
     SetLabel(drop.GetValue());
     if (drop.selection >= 0)
diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp
index 28b7b7c712..a1dacdd2ff 100644
--- a/src/slic3r/GUI/Widgets/TextInput.cpp
+++ b/src/slic3r/GUI/Widgets/TextInput.cpp
@@ -95,6 +95,7 @@ void TextInput::SetLabel(const wxString& label)
 
 void TextInput::SetIcon(const wxBitmap &icon)
 {
+    this->icon = ScalableBitmap();
     this->icon.bmp() = icon;
     Rescale();
 }