diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index fa64146ea6..8955b38934 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -1471,11 +1471,11 @@ function PMA_getListofMaintainActionLink($pma_table, $url_params)
 function PMA_getMaintainActionlink($action_message, $params, $url_params, $link)
 {
     return '<li>'
-        . '<a class="maintain_action ajax" '
-        . 'href="sql.php'
-        . URL::getCommon(array_merge($url_params, $params)) . '">'
-        . $action_message
-        . '</a>'
+        . Util::linkOrButton(
+            'sql.php' . URL::getCommon(array_merge($url_params, $params)),
+            $action_message,
+            ['class' => 'maintain_action ajax']
+        )
         . Util::showMySQLDocu($link)
         . '</li>';
 }
diff --git a/test/libraries/PMA_operations_test.php b/test/libraries/PMA_operations_test.php
index 8a88a58011..cb13818b2d 100644
--- a/test/libraries/PMA_operations_test.php
+++ b/test/libraries/PMA_operations_test.php
@@ -37,6 +37,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg'] = array(
             'ServerDefault' => 1,
             'ActionLinksMode' => 'icons',
+            'LinkLengthLimit' => 1000,
         );
         $GLOBALS['cfg']['DBG']['sql'] = false;
         $GLOBALS['server'] = 1;