diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 3627f27db..b8c04f8cf 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -976,7 +976,7 @@ void ObjectList::show_context_menu(const bool evt_context_menu)
 void ObjectList::extruder_editing()
 {
     wxDataViewItem item = GetSelection();
-    if (!item || !(m_objects_model->GetItemType(item) & (itVolume | itObject)))
+    if (!item || !(m_objects_model->GetItemType(item) & (itVolume | itObject | itLayer)))
         return;
 
     wxRect rect = this->GetItemRect(item, GetColumn(colExtruder));
@@ -1001,6 +1001,7 @@ void ObjectList::extruder_editing()
 
         m_extruder_editor->Hide();
         update_extruder_in_config(item);
+        Refresh();
     };
 
     // to avoid event propagation to other sidebar items
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index feda14a7f..d0148f251 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -804,6 +804,7 @@ void Preview::update_layers_slider_mode()
 
                     for (const auto& range : object->layer_config_ranges)
                         if (range.second.has("extruder") &&
+                            range.second.option("extruder")->getInt() != 0 && // extruder isn't default
                             range.second.option("extruder")->getInt() != extruder)
                             return false;
                 }