diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
index e306017a8..62e0e8984 100644
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -152,6 +152,10 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   )(EditGroupForm.apply)
 
 
+  get("/admin/dbviewer")(adminOnly {
+    html.dbviewer()
+  })
+
   get("/admin/system")(adminOnly {
     html.system(flash.get("info"))
   })
diff --git a/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html b/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html
new file mode 100644
index 000000000..011e5e109
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html
@@ -0,0 +1,15 @@
+@()(implicit context: gitbucket.core.controller.Context)
+@gitbucket.core.html.main("Database viewer") {
+  @gitbucket.core.admin.html.menu("dbviewer") {
+    <div id="editor" style="width: 100%; height: 300px;"></div>
+    <div id="result"></div>
+  }
+}
+<script src="@gitbucket.core.view.helpers.assets("/vendors/ace/ace.js")" type="text/javascript" charset="utf-8"></script>
+<script>
+$(function(){
+  $('#editor').text($('#initial').val());
+  var editor = ace.edit("editor");
+  editor.setTheme("ace/theme/monokai");
+});
+</script>
diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html
index fe70a8f43..d7a16aeb7 100644
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -25,10 +25,10 @@
           <span>Data export / import</span>
         </a>
       </li>
-      <li class="menu-item-hover">
-        <a href="@context.path/console/login.jsp" target="_blank">
+      <li class="menu-item-hover @if(active=="dbviewer"){active}">
+        <a href="@context.path/admin/dbviewer">
           <i class="menu-icon octicon octicon-database"></i>
-          <span>H2 console</span>
+          <span>Database viewer</span>
         </a>
       </li>
       @gitbucket.core.plugin.PluginRegistry().getSystemSettingMenus.map { menu =>