diff --git a/design.inc.php b/design.inc.php
index 748548ac..1a0ccbf7 100644
--- a/design.inc.php
+++ b/design.inc.php
@@ -11,7 +11,7 @@ function page_header($title) {
 <title><?php echo lang('phpMinAdmin') . " - $title"; ?></title>
 <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
 <link rel="stylesheet" type="text/css" href="default.css" />
-<?php if ($_SESSION["highlight"] == "jush") { ?>
+<?php if ($_COOKIE["highlight"] == "jush") { ?>
 <style type="text/css">@import url(http://jush.info/jush.css);</style>
 <script type="text/javascript" src="http://jush.info/jush.js" defer="defer"></script>
 <script type="text/javascript">window.onload = function () { jush.highlight_tag('pre'); }</script>
diff --git a/sql.inc.php b/sql.inc.php
index 1f4239c8..a94f7001 100644
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -1,6 +1,7 @@
 <?php
 if (isset($_POST["query"])) {
-	$_SESSION["highlight"] = $_POST["highlight"];
+	setcookie("highlight", $_POST["highlight"], strtotime("+1 month"));
+	$_COOKIE["highlight"] = $_POST["highlight"];
 }
 
 page_header(lang('SQL command'));
@@ -54,7 +55,7 @@ if ($_POST && $error) {
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Execute'); ?>" />
 <script type="text/javascript">
-document.write('<label for="highlight"><input type="checkbox" name="highlight" id="highlight" value="jush"<?php echo ($_SESSION["highlight"] == "jush" ? ' checked="checked"' : ''); ?> /><?php echo addcslashes(lang('Syntax highlighting'), "\r\n'\\"); ?></label>');
+document.write('<label for="highlight"><input type="checkbox" name="highlight" id="highlight" value="jush"<?php echo ($_COOKIE["highlight"] == "jush" ? ' checked="checked"' : ''); ?> /><?php echo addcslashes(lang('Syntax highlighting'), "\r\n'\\"); ?></label>');
 </script>
 </p>
 </form>