diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 5dab5c81d18..ca0051a4d82 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -292,7 +292,6 @@ instance.web.Loading = instance.web.Widget.extend({
 instance.web.DatabaseManager = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
-        self.$('.oe_topbar,.oe_leftbar').show();
         this.unblockUIFunction = instance.web.unblockUI;
         $.validator.addMethod('matches', function (s, _, re) {
             return new RegExp(re).test(s);
@@ -315,9 +314,10 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
     },
     do_render: function() {
         var self = this;
+        $('.oe_topbar,.oe_leftbar').show();
         self.$element.html(QWeb.render("DatabaseManager",{ widget : self }));
-        $('.oe_secondary_menus_container').replaceWith($('.datamanager_menu'));
-        $('.oe_user_menu_placeholder').replaceWith($('.oe_user_menu'));
+        $('.oe_secondary_menus_container').append($('.datamanager_menu'));
+        $('.oe_user_menu_placeholder').append($('.oe_user_menu'));
         $('ul.oe_secondary_submenu > li').bind('click', function (event) {
             $(this).addClass('oe_active').siblings().removeClass('oe_active');
             var $new = $(this);
@@ -496,8 +496,10 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
         });
     },
     do_exit: function () {
-        this.do_action('reload');
-        //this.do_action('login');
+        this.$element.remove();
+        $('.oe_secondary_menus_container,.oe_user_menu_placeholder').empty();
+        $('.oe_topbar,.oe_leftbar').hide();
+        this.do_action('login');
     }
 });
 instance.web.client_actions.add("database_manager", "instance.web.DatabaseManager");
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index dc900d2c0c0..88f7adfafb8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -131,11 +131,11 @@
     <div class="datamanager_menu">
         <div class="oe_secondary_menu_section">Database Management</div>
                         <ul class="oe_secondary_submenu">
-                            <li id="db-create" class="oe_active"><a href="#db_create">Create</a></li>
-                            <li id="db-drop"> <a href="#db_drop">Drop</a></li>
-                            <li id="db-backup"><a href="#db_backup">Backup</a></li>
-                            <li id="db-restore"> <a href="#db_restore">Restore</a></li>
-                            <li id="db-change-password"><a href="#db_change_password">Password</a></li>
+                            <li class="oe_active"><a href="#db_create">Create</a></li>
+                            <li><a href="#db_drop">Drop</a></li>
+                            <li><a href="#db_backup">Backup</a></li>
+                            <li><a href="#db_restore">Restore</a></li>
+                            <li><a href="#db_change_password">Password</a></li>
                         </ul>
             </div>
                 <div class="oe_view_manager_view_form">