diff --git a/reverse_engineering/connection_settings_modal/connectionSettingsModalConfig.json b/reverse_engineering/connection_settings_modal/connectionSettingsModalConfig.json
index d5c8f73a..7230cd77 100644
--- a/reverse_engineering/connection_settings_modal/connectionSettingsModalConfig.json
+++ b/reverse_engineering/connection_settings_modal/connectionSettingsModalConfig.json
@@ -60,10 +60,10 @@
 				"defaultValue": ""
 			},
 			{
-				"inputLabel": "Schema name",
+				"inputLabel": "Database name",
 				"inputKeyword": "databaseName",
 				"inputType": "text",
-				"inputPlaceholder": "Optional"
+				"inputTooltip": "Optionally specify the database name. If not provided, you will be asked for it after connection."
 			}
 		]
 	},
diff --git a/reverse_engineering/helpers/snowflakeHelper.js b/reverse_engineering/helpers/snowflakeHelper.js
index 9723ae56..488591aa 100644
--- a/reverse_engineering/helpers/snowflakeHelper.js
+++ b/reverse_engineering/helpers/snowflakeHelper.js
@@ -43,6 +43,12 @@ const connect = async (
 		databaseName,
 	},
 ) => {
+	if (connection) {
+		logger.log('info', 'connection already exists', 'Connection');
+
+		return connection;
+	}
+
 	const account = getAccount(host);
 	const accessUrl = getAccessUrl(account);
 	const timeout = _.toNumber(queryRequestTimeout) || 2 * 60 * 1000;
@@ -55,8 +61,8 @@ const connect = async (
 			`Auth type: ${authType}\n` +
 			`Username: ${username}\n` +
 			`Warehouse: ${warehouse}\n` +
-			`Role: ${role}\n`,
-		`Schema name: ${databaseName}`,
+			`Role: ${role}\n` +
+			`Database name: ${databaseName}`,
 		'Connection',
 	);
 
@@ -465,6 +471,7 @@ const disconnect = () => {
 			if (err) {
 				return reject(err);
 			}
+			connection = null;
 			resolve();
 		});
 	});