diff --git a/plugins/builtin/source/content/ui_items.cpp b/plugins/builtin/source/content/ui_items.cpp
index d0fe7e810..d49bc0762 100644
--- a/plugins/builtin/source/content/ui_items.cpp
+++ b/plugins/builtin/source/content/ui_items.cpp
@@ -404,8 +404,7 @@ namespace hex::plugin::builtin {
 
         // Provider switcher
         ContentRegistry::Interface::addToolbarItem([] {
-            const auto provider      = ImHexApi::Provider::get();
-            const bool providerValid = provider != nullptr;
+            const bool providerValid = ImHexApi::Provider::get() != nullptr;
             const bool tasksRunning  = TaskManager::getRunningTaskCount() > 0;
 
             ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
@@ -430,6 +429,9 @@ namespace hex::plugin::builtin {
                         auto &tabProvider = providers[i];
                         const auto selectedProviderIndex = ImHexApi::Provider::getCurrentProviderIndex();
 
+                        if (std::ranges::contains(ImHexApi::Provider::impl::getClosingProviders(), tabProvider))
+                            continue;
+
                         bool open = true;
                         ImGui::PushID(tabProvider);