diff --git a/src/ui/components/addCollection/addCollection.html b/src/ui/components/addCollection/addCollection.html
index d042f97f..c78a6e1a 100644
--- a/src/ui/components/addCollection/addCollection.html
+++ b/src/ui/components/addCollection/addCollection.html
@@ -5,9 +5,9 @@
       <i class="close fa fa-plus rotate-45" ng-click="close()"></i>
     </div>
     <div class="modal-body">
-      <div class="form-group" ng-class="{ 'has-error' : !addCollectionForm.name.$valid && addCollectionFormSubmitted }">
+      <div class="form-group" ng-class="{ 'has-error' : !addCollectionForm.name.$valid && addCollectionFormSubmitted }" ng-init="setFocus()">
         <label class="control-label">Name</label>
-        <input class="form-control" type="text" name="name" ng-model="form.name" required>
+        <input class="form-control" type="text" name="name" ng-model="form.name" required id="newCollection">
       </div>
     </div>
     <div class="modal-footer clearfix">
diff --git a/src/ui/components/addCollection/addCollectionCtrl.js b/src/ui/components/addCollection/addCollectionCtrl.js
index 50129192..ed1cb381 100644
--- a/src/ui/components/addCollection/addCollectionCtrl.js
+++ b/src/ui/components/addCollection/addCollectionCtrl.js
@@ -4,7 +4,8 @@ angular.module('app').controller('addCollectionCtrl', [
   '$scope',
   '$uibModalInstance',
   'database',
-  'notificationService', ($scope, $uibModalInstance, database, notificationService) => {
+  'notificationService',
+  '$window', ($scope, $uibModalInstance, database, notificationService, $window) => {
     const logger = require('lib/modules/logger');
 
     $scope.close = function() {
@@ -28,5 +29,12 @@ angular.module('app').controller('addCollectionCtrl', [
           logger.error(err);
         });
     };
+
+    $scope.setFocus = function() {
+      setTimeout(function() {
+        var collectionField = $window.document.getElementById('newCollection');
+        collectionField.focus();
+      }, 100);
+    }
   }
 ]);
diff --git a/src/ui/components/addDatabase/addDatabase.html b/src/ui/components/addDatabase/addDatabase.html
index 25770e9d..3478a463 100644
--- a/src/ui/components/addDatabase/addDatabase.html
+++ b/src/ui/components/addDatabase/addDatabase.html
@@ -5,9 +5,9 @@
       <i class="close fa fa-plus rotate-45" ng-click="close()"></i>
     </div>
     <div class="modal-body">
-      <div class="form-group" ng-class="{ 'has-error' : !addDatabaseForm.name.$valid && addDatabaseFormSubmitted }">
+      <div class="form-group" ng-class="{ 'has-error' : !addDatabaseForm.name.$valid && addDatabaseFormSubmitted }" ng-init="setFocus()">
         <label class="control-label">Name</label>
-        <input class="form-control" type="text" name="name" ng-model="form.name" required>
+        <input class="form-control" type="text" name="name" ng-model="form.name" required id="newDatabase">
       </div>
     </div>
     <div class="modal-footer clearfix">
diff --git a/src/ui/components/addDatabase/addDatabaseCtrl.js b/src/ui/components/addDatabase/addDatabaseCtrl.js
index 2844b657..f9d18733 100644
--- a/src/ui/components/addDatabase/addDatabaseCtrl.js
+++ b/src/ui/components/addDatabase/addDatabaseCtrl.js
@@ -5,7 +5,8 @@ angular.module('app').controller('addDatabaseCtrl', [
   '$uibModalInstance',
   'connection',
   'notificationService',
-  function($scope, $uibModalInstance, connection, notificationService) {
+  '$window',
+  function($scope, $uibModalInstance, connection, notificationService, $window) {
 
     $scope.close = function() {
       $uibModalInstance.close(1);
@@ -30,5 +31,12 @@ angular.module('app').controller('addDatabaseCtrl', [
           notificationService.error('Error creating a new database');
         });
     };
+
+    $scope.setFocus = function() {
+      setTimeout(function() {
+        var collectionField = $window.document.getElementById('newDatabase');
+        collectionField.focus();
+      }, 100);
+    }
   }
 ]);
diff --git a/src/ui/directives/sidebar/sidebarCtrl.js b/src/ui/directives/sidebar/sidebarCtrl.js
index eb8fe2b0..b8420b0d 100644
--- a/src/ui/directives/sidebar/sidebarCtrl.js
+++ b/src/ui/directives/sidebar/sidebarCtrl.js
@@ -1,5 +1,5 @@
 'use strict';
-
+const Promise = require('bluebird');
 angular.module('app').controller('sidebarCtrl', [
   '$scope',
   '$timeout',
@@ -56,6 +56,8 @@ angular.module('app').controller('sidebarCtrl', [
     $scope.openDatabaseContextMenu = function openDatabaseContextMenu(database, connection) {
       if (!database || !connection) return;
 
+      var scope = this;
+
       menuService.showMenu([{
         label: 'New Collection',
         click: () => {
@@ -72,24 +74,26 @@ angular.module('app').controller('sidebarCtrl', [
               confirmButtonMessage: 'Yes',
               cancelButtonMessage: 'No'
             }).result.then(() => {
-              database.drop()
-                .then(() => {
-                  notificationService.success('Database dropped');
-
-                  tabCache.removeByDatabase(database);
-
-                  let index = connection.databases.indexOf(database);
-                  if (index >= 0) {
-                    connection.databases.splice(index, 1);
-                  }
-                })
-                .catch((err) => {
-                  logger.error(err);
-                  notificationService.error({
-                    title: 'Error dropping database',
-                    message: err
+              _openDatabase(database, connection).then(() => {
+                database.drop()
+                  .then(() => {
+                    notificationService.success('Database dropped');
+
+                    tabCache.removeByDatabase(database);
+
+                    let index = connection.databases.indexOf(database);
+                    if (index >= 0) {
+                      connection.databases.splice(index, 1);
+                    }
+                  })
+                  .catch((err) => {
+                    logger.error(err);
+                    notificationService.error({
+                      title: 'Error dropping database',
+                      message: err
+                    });
                   });
-                });
+              })
             });
           });
         }
@@ -160,42 +164,26 @@ angular.module('app').controller('sidebarCtrl', [
       }]);
     };
 
-    $scope.openDatabase = function openDatabase(database, connection) {
+    $scope.openDatabase = function openDatabase(database, connection, callback) {
       if (!database) return;
 
       if (!database.isOpen) {
-        if (connection) { //collapse other databases with the same connection
-          _.each(connection.databases, (database) => {
-            _collapseDatabase(database);
-          });
-        }
-
-        database.opening = true;
-
-        database.open()
+        _openDatabase(database, connection)
           .then(() => {
-            $timeout(() => {
-              database.isOpen = true;
-            });
+            _toggleFolders(database);
           })
-          .catch((err) => {
-            $timeout(() => {
-              notificationService.error({
-                title: 'Error opening database',
-                message: err
-              });
+          .catch(err => {
+            logger.error(err);
+            notificationService.error({
+              title: 'Error dropping database',
+              message: err
             });
           })
-          .finally(() => {
-            $timeout(() => {
-              database.opening = false;
-            });
-          });
       } else {
         _collapseDatabase(database);
+        _toggleFolders(database);
       }
 
-      database.showFolders = !database.showFolders;
     };
 
     //collections
@@ -251,6 +239,10 @@ angular.module('app').controller('sidebarCtrl', [
       database.isOpen = false;
     }
 
+    function _toggleFolders(database) {
+      database.showFolders = !database.showFolders;
+    }
+
     function _listCollections(database) {
       database.loadingCollections = true;
       database.listCollections()
@@ -278,5 +270,46 @@ angular.module('app').controller('sidebarCtrl', [
           });
         });
     }
+
+
+    function _openDatabase(database, connection) {
+      return new Promise(function (resolve, reject) {
+        if (database.isOpen) {
+          return resolve(true);
+        }
+        if (!connection) {
+          return reject('No connection');
+        }
+        _.each(connection.databases, (database) => {
+          _collapseDatabase(database);
+        });
+
+        database.opening = true;
+
+        database.open()
+          .then(() => {
+            $timeout(() => {
+              database.isOpen = true;
+              resolve(true);
+            });
+          })
+          .catch((err) => {
+            $timeout(() => {
+              notificationService.error({
+                title: 'Error opening database',
+                message: err
+              });
+              reject(err);
+            });
+          })
+          .finally(() => {
+            $timeout(() => {
+              database.opening = false;
+            });
+          });
+
+        
+      });
+    }
   }
-]);
+]);
\ No newline at end of file