diff --git a/src/libslic3r/GCode/CoolingBuffer.cpp b/src/libslic3r/GCode/CoolingBuffer.cpp
index e47133cc7..49be67a6e 100644
--- a/src/libslic3r/GCode/CoolingBuffer.cpp
+++ b/src/libslic3r/GCode/CoolingBuffer.cpp
@@ -284,7 +284,7 @@ finished:
         float time_stretch_final = 0.f;
         for (auto it = it_begin; it != it_end; ++ it)
             time_stretch_final += (*it)->time_stretch_when_slowing_down_to_feedrate(new_feedrate);
-        assert(std::abs(time_stretch - time_stretch_final) < EPSILON);
+        //assert(std::abs(time_stretch - time_stretch_final) < EPSILON);
     }
 #endif /* NDEBUG */
 
diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index 9cc2887b6..6839627f7 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -696,7 +696,14 @@ bool PlaterPresetComboBox::switch_to_tab()
 
     wxGetApp().tab_panel()->SetSelection(page_id);
     // Switch to Settings NotePad
-    wxGetApp().mainframe->select_tab(MainFrame::ETabType::LastSettings);
+    if(m_type == Preset::Type::TYPE_PRINT || m_type == Preset::Type::TYPE_SLA_PRINT)
+        wxGetApp().mainframe->select_tab(MainFrame::ETabType::PrintSettings);
+    else if (m_type == Preset::Type::TYPE_FILAMENT || m_type == Preset::Type::TYPE_SLA_MATERIAL)
+        wxGetApp().mainframe->select_tab(MainFrame::ETabType::FilamentSettings);
+    else if (m_type == Preset::Type::TYPE_PRINTER)
+        wxGetApp().mainframe->select_tab(MainFrame::ETabType::PrinterSettings);
+    else
+        wxGetApp().mainframe->select_tab(MainFrame::ETabType::LastSettings);
     return true;
 }