diff --git a/ChangeLog b/ChangeLog
index 77402aff8e..24ec196a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog
 - issue #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given
 - issue #11632 Exporting GIS visualization ignores start and row count
 - issue #11476 Errors instead of git info when PHP has no gzip support
+- issue #11633 CodeMirror tooltip shows below modal window
 
 4.5.1.0 (2015-10-23)
 - issue        Invalid argument supplied for foreach()
diff --git a/themes/pmahomme/css/codemirror.css.php b/themes/pmahomme/css/codemirror.css.php
index 8b3944334e..a7c6cb38ee 100644
--- a/themes/pmahomme/css/codemirror.css.php
+++ b/themes/pmahomme/css/codemirror.css.php
@@ -74,4 +74,7 @@ span.cm-number {
 }
 .CodeMirror-hints {
     z-index: 200;
-}
\ No newline at end of file
+}
+.CodeMirror-lint-tooltip {
+    z-index: 200;
+}