diff --git a/js/codemirror/lib/codemirror.js b/js/codemirror/lib/codemirror.js
index 7498f3aead..15788ffe23 100644
--- a/js/codemirror/lib/codemirror.js
+++ b/js/codemirror/lib/codemirror.js
@@ -1,4 +1,4 @@
-// CodeMirror version 2.37
+// CodeMirror version 2.38
 //
 // All functions that need access to the editor's state live inside
 // the CodeMirror function. Below that, at the bottom of the file,
@@ -3186,7 +3186,7 @@ window.CodeMirror = (function() {
     for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
   })();
 
-  CodeMirror.version = "2.37";
+  CodeMirror.version = "2.38";
 
   return CodeMirror;
 })();
diff --git a/server_databases.php b/server_databases.php
index fa25a008e9..dc52517f3a 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -155,7 +155,7 @@ if ($server > 0) {
     $databases = PMA_DBI_get_databases_full(
         null, $dbstats, null, $sort_by, $sort_order, $pos, true
     );
-    $databases_count = count($GLOBALS['pma']->databases);
+    $databases_count = count($databases);
 } else {
     $databases_count = 0;
 }