diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 66951145e..d15789195 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -6281,6 +6281,11 @@ bool GLCanvas3D::_init_main_toolbar()
             if (agent) agent->track_update_property("custom_height", std::to_string(++custom_height_count));
         }
     };
+    item.right.action_callback = [this]() {
+        if (m_canvas != nullptr) {
+            wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_LAYERSEDITING));
+        }
+    };
     item.visibility_callback = [this]()->bool {
         bool res = current_printer_technology() == ptFFF;
         // turns off if changing printer technology
@@ -9324,7 +9329,7 @@ bool GLCanvas3D::_deactivate_orient_menu()
 bool GLCanvas3D::_deactivate_layersediting_menu()
 {
     if (m_main_toolbar.is_item_pressed("layersediting")) {
-        m_main_toolbar.force_left_action(m_main_toolbar.get_item_id("layersediting"), *this);
+        m_main_toolbar.force_right_action(m_main_toolbar.get_item_id("layersediting"), *this);
         return true;
     }
 
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index f149570ea..738ed6e12 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -2126,7 +2126,7 @@ struct Plater::priv
     //ObjectTableDialog* m_popup_table{ nullptr };
     std::chrono::system_clock::time_point start;
     std::string file_type;
-    std::string is_mw;
+    std::string is_mw{"false"};
 
 #if ENABLE_ENVIRONMENT_MAP
     GLTexture environment_texture;
@@ -4212,7 +4212,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
         if (model.model_info == nullptr) {
             is_mw = "false";
         }
-        else {
+        else if(model.model_info->description != "") {
             is_mw = "true";
         }
     }