diff --git a/ChangeLog b/ChangeLog
index 5717891b7..cd474d8f2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ $Source$
       tbl_properties_operations.php, tbl_indexes.php: Fix XHTML.
     * tbl_properties_export.php: Fix output before headers.
     * Documentation.html: Add commands how to setup config dir.
+    * scripts/setup.php: Show Save and Load buttons disabled if saving not
+      available.
 
 2005-12-08 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/tbl_move_copy.php: added PMA_table_rename()
diff --git a/scripts/setup.php b/scripts/setup.php
index 245dbdfa1..25488643a 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -327,12 +327,16 @@ function get_hidden_cfg() {
  *
  * @return  string  HTML with form
  */
-function get_action($name, $title, $added = '') {
+function get_action($name, $title, $added = '', $enabled = TRUE) {
     $ret = '';
     $ret .= '<form class="action" method="POST">';
     $ret .= '<input type="hidden" name="action" value="' . $name . '" />';
     $ret .= $added;
-    $ret .= '<input type="submit" value="' . $title . '" />';
+    $ret .= '<input type="submit" value="' . $title . '"';
+    if (!$enabled) {
+        $ret .= ' disabled="disabled"';
+    }
+    $ret .= ' />';
     $ret .= get_hidden_cfg();
     $ret .= '</form>';
     $ret .= "\n";
@@ -1844,10 +1848,8 @@ echo '<fieldset class="toolbar"><legend>Configuration</legend>' . "\n";
 echo get_action('main', 'Overview');
 echo get_action('display', 'Display');
 echo get_action('download', 'Download');
-if (!$fail_dir) {
-    echo get_action('save', 'Save');
-    echo get_action('load', 'Load');
-}
+echo get_action('save', 'Save', '', !$fail_dir);
+echo get_action('load', 'Load', '', !$fail_dir);
 echo get_action('clear', 'Clear');
 echo '</fieldset>' . "\n\n";