diff --git a/ChangeLog b/ChangeLog
index 33b4d84515..66bed1d319 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@ phpMyAdmin - ChangeLog
 - issue #12055 Fixed PHP syntax error in templates
 - issue #12054 Fixed processing of queries with escaped quotes
 - issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT
+- issue #12073 Hide edit and delete buttons when the results are not related to a table
 
 4.5.5.1 (2016-02-29)
 - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.
diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
index de5b495eb3..a3d7288480 100644
--- a/libraries/DisplayResults.php
+++ b/libraries/DisplayResults.php
@@ -572,6 +572,13 @@ class DisplayResults
                 $prev_table = $fields_meta[$i]->table;
             }
         } // end for
+
+        if ($prev_table == '') { // no table for any of the columns
+            // don't display links
+            $displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE;
+            $displayParts['del_lnk']  = self::NO_EDIT_OR_DELETE;
+        }
+
         return $displayParts;
     }