diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
index ec9d82ff0..d84b6b687 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
@@ -302,8 +302,9 @@ define('pgadmin.node.database', [
             data.is_connecting = true;
             connect_to_database(this, data, pgBrowser.tree, item, false);
           }
-
-          return pgBrowser.Node.callbacks.selected.apply(this, arguments);
+          if(data.connected){
+            return pgBrowser.Node.callbacks.selected.apply(this, arguments);
+          }
         },
 
         refresh: function(cmd, i) {
@@ -448,6 +449,7 @@ define('pgadmin.node.database', [
               /* Call enable/disable menu function after database is connected.
                To make sure all the menus for database is in the right state */
               pgBrowser.enable_disable_menus.apply(pgBrowser, [_item]);
+              pgBrowser.Nodes['database'].callbacks.selected(_item, _data);
 
               if (!_connected) {
                 setTimeout(function() {
diff --git a/web/regression/feature_tests/pg_utilities_maintenance_test.py b/web/regression/feature_tests/pg_utilities_maintenance_test.py
index 39bf2079e..530cdd5c5 100644
--- a/web/regression/feature_tests/pg_utilities_maintenance_test.py
+++ b/web/regression/feature_tests/pg_utilities_maintenance_test.py
@@ -100,7 +100,7 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest):
             status = False
             if table_node:
                 status = True
-            self.assertTrue(status, "Table name {} is not visible/selected".
+            self.assertTrue(status, "Table name {0} is not visible/selected".
                             format(self.table_name))
             table_node.click()
 
diff --git a/web/regression/feature_utils/base_feature_test.py b/web/regression/feature_utils/base_feature_test.py
index e2c479224..956c1b16c 100644
--- a/web/regression/feature_utils/base_feature_test.py
+++ b/web/regression/feature_utils/base_feature_test.py
@@ -70,7 +70,7 @@ class BaseFeatureTest(BaseTestGenerator):
         self.after()
 
     def any_step_failed(self):
-        for step in self._outcome.result.errors:
+        for step in self._outcome.errors:
             if step[1] is not None:
                 return True
         return False