diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts
index 0ef1eeca84..34674257ac 100644
--- a/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts
@@ -117,7 +117,7 @@ export class ExplorerTable extends Disposable {
 			};
 		} else {
 			context = {
-				profile: dataContext,
+				profile: dataContext.toIConnectionProfile(),
 				uri: this.bootStrapService.getUnderlyingUri()
 			};
 		}
diff --git a/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts b/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts
index c04dd781c9..dc1d453336 100644
--- a/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts
+++ b/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts
@@ -296,6 +296,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerWidgetContext, {
 		id: commands.ExplorerScriptCreateAction.ID,
 		title: commands.ExplorerScriptCreateAction.LABEL
 	},
+	when: ItemContextKey.ItemType.notEqualsTo('database'),
 	order: 2
 });
 //#endregion