diff --git a/js/pmd/move.js b/js/pmd/move.js
index e8bcc85c88..8a1e6b01b6 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -132,6 +132,20 @@ function MouseDown(e)
 {
     Glob_X = dx = isIE ? e.clientX + document.body.scrollLeft : e.pageX;
     Glob_Y = dy = isIE ? e.clientY + document.body.scrollTop : e.pageY;
+
+    if (e.target.tagName == "SPAN") {
+        cur_click = e.target.parentNode.parentNode.parentNode.parentNode;
+    }
+    else if (e.target.className == "tab_zag_2") {
+        cur_click = e.target.parentNode.parentNode.parentNode;
+    }
+    else if (e.target.className == "icon") {
+        layer_menu_cur_click = 1;
+    }
+    else if (e.target.className == "M_butt") {
+        return false;
+    }
+
     if (cur_click !== null) {
         document.getElementById("canvas").style.display = 'none';
         cur_click.style.zIndex = 2;
diff --git a/templates/database/designer/database_tables.phtml b/templates/database/designer/database_tables.phtml
index 5d9a7b6768..a4308dcad7 100644
--- a/templates/database/designer/database_tables.phtml
+++ b/templates/database/designer/database_tables.phtml
@@ -38,7 +38,6 @@
                 </td>
                 <td id="id_zag_<?= htmlspecialchars($t_n_url); ?>"
                     class="tab_zag nowrap tab_zag_noquery"
-                    onmousedown="cur_click=document.getElementById('<?= $t_n_url; ?>');"
                     table_name="<?= htmlspecialchars($t_n_url); ?>"
                     query_set="<?= isset($_REQUEST['query']) ? 1 : 0 ; ?>" >
                     <span class="owner">
@@ -49,8 +48,7 @@
                 <?php if (isset($_REQUEST['query'])) : ?>
                     <td class="tab_zag tab_zag_query"
                         id="id_zag_<?= htmlspecialchars($t_n_url); ?>_2"
-                        table_name="<?= htmlspecialchars($t_n_url); ?>"
-                        onmousedown="cur_click=document.getElementById('<?= htmlspecialchars($t_n_url); ?>');">
+                        table_name="<?= htmlspecialchars($t_n_url); ?>">
                     </td>
                <?php endif; ?>
             </tr>
diff --git a/templates/database/designer/side_menu.phtml b/templates/database/designer/side_menu.phtml
index 9615bcc53c..4a1db6be0d 100644
--- a/templates/database/designer/side_menu.phtml
+++ b/templates/database/designer/side_menu.phtml
@@ -160,7 +160,6 @@ function getImg($path)
         <a class="M_butt"
            href="#"
            onclick="build_query('SQL Query on Database', 0)"
-           onmousedown="return false;"
            class="M_butt">
             <img title="<?= __('Build Query'); ?>"
                  src="<?= getImg('pmd/query_builder.png'); ?>" />
diff --git a/templates/database/designer/table_list.phtml b/templates/database/designer/table_list.phtml
index 0e4fb2201c..3d5774e77b 100644
--- a/templates/database/designer/table_list.phtml
+++ b/templates/database/designer/table_list.phtml
@@ -54,7 +54,7 @@
     <div class="center">
         <?= __('Number of tables:'); ?> <?= $name_cnt; ?>
     </div>
-    <div id="layer_menu_sizer" onmousedown="layer_menu_cur_click=1">
+    <div id="layer_menu_sizer">
         <div class="floatleft">
             <img class="icon"
                  data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/resizeright.png'); ?>"