@@ -539,9 +539,24 @@ export default function SchemaExplorer({ onInsertText, onSelectQuery, onOpenInNe
       try {
         if (key.startsWith('plugin:')) {
           const pluginName = key.replace('plugin:', '');
-          if (!schemasCacheRef.current[pluginName]) {
-            const schemas = await getPluginSchemas(pluginName);
-            setSchemasCache((prev) => ({ ...prev, [pluginName]: schemas }));
+          let schemas = schemasCacheRef.current[pluginName];
+          if (!schemas) {
+            schemas = await getPluginSchemas(pluginName);
+            setSchemasCache((prev) => ({ ...prev, [pluginName]: schemas! }));
+          }
+          // When the plugin's only schema repeats the plugin name the tree collapses the
+          // two into one node, so its contents must be loaded here.
+          if (schemas.length === 1 && schemas[0].name === pluginName) {
+            const pluginType = pluginTypesCacheRef.current[pluginName] || '';
+            if (isFileBasedPlugin(pluginType, pluginName)) {
+              if (!filesCacheRef.current[`schema:${pluginName}`]) {
+                const files = await getFiles(pluginName);
+                setFilesCache((prev) => ({ ...prev, [`schema:${pluginName}`]: files }));
+              }
+            } else if (!tablesCacheRef.current[pluginName]) {
+              const tables = await getTables(pluginName, projectId);
+              setTablesCache((prev) => ({ ...prev, [pluginName]: tables }));
+            }
           }
           loaded = true;
 
 
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 import { describe, it, expect, vi } from 'vitest';
-import { buildColumnNodes, buildTableNodes } from './TreeNodeBuilder';
+import { buildColumnNodes, buildPluginNode, buildTableNodes } from './TreeNodeBuilder';
 import type { UsageCounts } from './TreeNodeBuilder';
-import type { ColumnInfo, TableInfo } from '../../types';
+import type { ColumnInfo, PluginInfo, TableInfo } from '../../types';
 import type { ReactElement } from 'react';
 import { EyeOutlined, TableOutlined, ThunderboltOutlined } from '@ant-design/icons';
 
@@ -234,3 +234,28 @@ describe('buildTableNodes icons', () => {
     expect(iconOf('MATERIALIZED VIEW')).toBe(ThunderboltOutlined);
   });
 });
+
+describe('buildPluginNode', () => {
+  const plugin: PluginInfo = { name: 'splunk', type: 'splunk', enabled: true, browsable: true };
+
+  it('collapses a lone schema named after the plugin', () => {
+    const node = buildPluginNode(
+      plugin,
+      { splunk: [{ name: 'splunk', plugin: 'splunk', type: 'schema', browsable: true }] },
+      { splunk: [{ name: 'main', schema: 'splunk', type: 'TABLE' }] },
+      {}, {}, {}, {},
+    );
+
+    expect(node.children?.map((c) => c.key)).toEqual(['table:splunk:main']);
+  });
+
+  it('keeps the schema level when schemas differ from the plugin name', () => {
+    const node = buildPluginNode(
+      plugin,
+      { splunk: [{ name: 'splunk.audit', plugin: 'splunk', type: 'schema', browsable: true }] },
+      {}, {}, {}, {}, {},
+    );
+
+    expect(node.children?.map((c) => c.key)).toEqual(['schema:splunk.audit']);
+  });
+});
@@ -449,6 +449,12 @@ export function buildPluginNode(
     ? buildSchemaNodes(plugin, schemas, tablesCache, columnsCache, filesCache, nestedCache, subTablesCache, columnFilter, onColumnFilterChange, usageCounts)
     : undefined;
 
+  // Plugins whose only schema repeats the plugin name (Splunk, Mongo, …) would otherwise
+  // render "splunk > splunk > tables".  Hoist that schema's children onto the plugin node.
+  const children = schemaNodes && schemas.length === 1 && schemas[0].name === plugin.name
+    ? schemaNodes[0].children
+    : schemaNodes;
+
   const isHttpPlugin = plugin.type?.toLowerCase().includes('http') || plugin.name.toLowerCase() === 'http';
 
   return {
@@ -469,7 +475,7 @@ export function buildPluginNode(
       </span>
     ),
     icon: getPluginIcon(plugin.type, plugin.name),
-    children: schemaNodes,
+    children,
     isLeaf: false,
   };
 }