diff --git a/js/pmd/move.js b/js/pmd/move.js
index 2a0a819732..c3697b4c23 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -163,7 +163,7 @@ function MouseUp(e)
     if (cur_click != null) {
         document.getElementById("canvas").style.display = 'inline-block';
         Re_load();
-        cur_click.style.zIndex = 901;
+        cur_click.style.zIndex = 400;
         cur_click = null;
     }
     layer_menu_cur_click = 0;
diff --git a/pmd_general.php b/pmd_general.php
index 64438791e6..2971dd25a5 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -152,6 +152,7 @@ if (isset($_REQUEST['query'])) {
     </a>
 </div>
 
+<div id="canvas_outer">
 <form action="" method="post" name="form1">
 <div id="osn_tab">
   <canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas>
@@ -229,12 +230,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
           left: <?php
           echo isset($tab_pos[$t_n]) ? $tab_pos[$t_n]["X"] : rand(20, 700); ?>px;
           top: <?php
-          echo isset($tab_pos[$t_n]) ? $tab_pos[$t_n]["Y"] : rand(90, 550); ?>px;
+          echo isset($tab_pos[$t_n]) ? $tab_pos[$t_n]["Y"] : rand(20, 550); ?>px;
           visibility: <?php
           echo ! isset($tab_pos[$t_n]) || $tab_pos[$t_n]["H"]
             ? "visible"
             : "hidden"; ?>;
-         z-index: 901;">
+         z-index: 400;">
 <thead>
 <tr>
     <?php
@@ -372,6 +373,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 }
 ?>
 </form>
+</div>
 <div id="pmd_hint"></div>
 
 <table id="layer_new_relation" style="display:none;"
diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
index 30c4736359..2b130c49bc 100644
--- a/themes/pmahomme/css/pmd.css.php
+++ b/themes/pmahomme/css/pmd.css.php
@@ -19,6 +19,10 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
     color: #000;
 }
 
+#canvas_outer {
+    position: relative;
+}
+
 #canvas {
     background-color: #fff;
     color: #000;