From 4d59fdea1b8da2f3e2f19f223ae13e2aef8afc17 Mon Sep 17 00:00:00 2001
From: AlexFsmn <alexander.forssman@gmail.com>
Date: Sat, 15 Sep 2018 22:44:58 +0200
Subject: [PATCH] The "New Query" context menu is now only available from the
 server & db (#2598)

#1890
---
 .../parts/objectExplorer/viewlet/serverTreeActionProvider.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts
index b6a73ca0e5..258a4b0aa5 100644
--- a/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts
+++ b/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts
@@ -167,12 +167,12 @@ export class ServerTreeActionProvider extends ContributableActionProvider {
 		if (TreeUpdateUtils.isDatabaseNode(treeNode)) {
 			if (TreeUpdateUtils.isAvailableDatabaseNode(treeNode)) {
 				actions.push(this._instantiationService.createInstance(ManageConnectionAction, ManageConnectionAction.ID, ManageConnectionAction.LABEL, context.tree));
+				this.addNewQueryAction(context, actions);
 			} else {
 				return actions;
 			}
 		}
 
-		this.addNewQueryAction(context, actions);
 		this.addScriptingActions(context, actions);
 		actions.push(this._instantiationService.createInstance(RefreshAction, RefreshAction.ID, RefreshAction.LABEL, context.tree, treeNode));