diff --git a/InvenTree/plugin/base/integration/mixins.py b/InvenTree/plugin/base/integration/mixins.py
index c347d6c406..6977ef3dd9 100644
--- a/InvenTree/plugin/base/integration/mixins.py
+++ b/InvenTree/plugin/base/integration/mixins.py
@@ -60,6 +60,7 @@ class SettingsMixin:
 
         if not plugin:
             # Cannot find associated plugin model, return
+            logger.error(f"Plugin configuration not found for plugin '{self.slug}'")
             return  # pragma: no cover
 
         PluginSetting.set_setting(key, value, user, plugin=plugin)
diff --git a/InvenTree/plugin/registry.py b/InvenTree/plugin/registry.py
index 3d58634340..d97fa73923 100644
--- a/InvenTree/plugin/registry.py
+++ b/InvenTree/plugin/registry.py
@@ -243,7 +243,7 @@ class PluginsRegistry:
     # endregion
 
     # region registry functions
-    def with_mixin(self, mixin: str):
+    def with_mixin(self, mixin: str, active=None):
         """
         Returns reference to all plugins that have a specified mixin enabled
         """
@@ -251,6 +251,14 @@ class PluginsRegistry:
 
         for plugin in self.plugins.values():
             if plugin.mixin_enabled(mixin):
+
+                if active is not None:
+                    # Filter by 'enabled' status
+                    config = plugin.plugin_config()
+                    
+                    if config.active != active:
+                        continue
+
                 result.append(plugin)
 
         return result
diff --git a/InvenTree/plugin/samples/integration/custom_panel_sample.py b/InvenTree/plugin/samples/integration/custom_panel_sample.py
index dd84a2a86f..3d44bc0c5b 100644
--- a/InvenTree/plugin/samples/integration/custom_panel_sample.py
+++ b/InvenTree/plugin/samples/integration/custom_panel_sample.py
@@ -58,7 +58,7 @@ class CustomPanelSample(PanelMixin, SettingsMixin, InvenTreePlugin):
 
         panels = [
             {
-                # This panel will not be displayed, as it is missing the 'content' key
+                # Simple panel without any actual content
                 'title': 'No Content',
             }
         ]
diff --git a/InvenTree/plugin/views.py b/InvenTree/plugin/views.py
index 9b12ef12fe..ad4d54daea 100644
--- a/InvenTree/plugin/views.py
+++ b/InvenTree/plugin/views.py
@@ -29,7 +29,7 @@ class InvenTreePluginViewMixin:
 
         panels = []
 
-        for plug in registry.with_mixin('panel'):
+        for plug in registry.with_mixin('panel', active=True):
 
             try:
                 panels += plug.render_panels(self, self.request, ctx)