diff --git a/pmd_general.php b/pmd_general.php
index cf8d842d69..1a7d3df67c 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -32,7 +32,7 @@ echo '
     var db = "' . PMA_escapeJsString($db) . '";
     var token = "' . PMA_escapeJsString($token) . '";';
     echo "\n";
-    if ($_REQUEST['query']) {
+    if (isset($_REQUEST['query'])) {
     echo '
      $(document).ready(function() {
         $(".trigger").click(function() {
@@ -103,7 +103,7 @@ echo $script_tabs . $script_contr . $script_display_field;
         ><img src="pmd/images/pdf.png" alt="key" width="20" height="20"
                 title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a
          >
-        <?php if ($_REQUEST['query']) {
+        <?php if (isset($_REQUEST['query'])) {
             echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;"
             class="M_butt" target="_self">';
             echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="';