diff --git a/js/functions.js b/js/functions.js
index 6233ce4da..9d62ee8c7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2512,5 +2512,19 @@ $(document).ready(function() {
      */
     PMA_init_slider();
 
+    /**
+     * Enables the text generated by PMA_linkOrButton() to be clickable
+     */
+    $('.clickprevimage')
+        .css('color', function(index) {
+            return $('a').css('color');
+        })
+        .css('cursor', function(index) {
+            return $('a').css('cursor');
+        }) //todo: hover effect
+        .live('click',function(e) {
+            $(this).parent().find('input:image').click();
+        });
+
 }) // end of $(document).ready()
 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 4023cb27a..fd5da8306 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1876,7 +1876,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
                 // but we can at least show the message.
                 // If PropertiesIconic is false or 'both'
                 if ($GLOBALS['cfg']['PropertiesIconic'] !== true) {
-                    $ret .= ' ' . $displayed_message;
+                    $ret .= ' <span class="clickprevimage">' . $displayed_message . '</span>';
                 }
             }
         } else {