diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 407df8304f..4bf02edfbd 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1035,6 +1035,9 @@ void ExtruderGroup::update_ams()
         info1.cans.push_back({});
     }
 
+    if (btn_edit == nullptr)
+        return;
+
     page_num  = (ams_n4 * 2 + ams_n1 + 3) / 4;
     size_t i4 = page_cur * 2;
     size_t i1 = 0;
diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
index 32b4b32988..2a611b1fe1 100644
--- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
+++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
@@ -783,7 +783,7 @@ void PrinterFileSystem::UpdateFocusThumbnail()
                 names.push_back({file.name, ""});
             else
                 paths.push_back({file.name, file.path});
-            if (names.size() >= 5 || paths.size() >= 5)
+            if (names.size() >= 2 || paths.size() >= 2)
                 break;
             if ((file.flags & FF_THUMNAIL_RETRY) != 0) {
                 const_cast<File&>(file).flags &= ~FF_THUMNAIL_RETRY;