diff --git a/template.php b/template.php
index 6b51ab8..1174c64 100644
--- a/template.php
+++ b/template.php
@@ -210,7 +210,11 @@ function zen_preprocess_html(&$variables, $hook) {
       $variables['classes_array'][] = 'page-panels';
       break;
   }
-  $variables['jump_link_target'] = theme_get_setting('zen_jump_link_target');
+  $variables['jump_link_target'] = l('Jump to Navigation', '', array(
+    'attributes' => array('class' => array(
+      'element-invisible',
+      'element-focusable')),
+    'fragment' => theme_get_setting('zen_jump_link_target')));
 }
 
 /**
diff --git a/templates/html.tpl.php b/templates/html.tpl.php
index 2f04b89..a8bdb05 100644
--- a/templates/html.tpl.php
+++ b/templates/html.tpl.php
@@ -70,9 +70,11 @@
   <?php print $scripts; ?>
 </head>
 <body class="<?php print $classes; ?>" <?php print $attributes;?>>
-  <div id="skip-link">
-    <a href="#<?php print $jump_link_target; ?>" class="element-invisible element-focusable"><?php print t('Jump to Navigation'); ?></a>
-  </div>
+  <?php if ($jump_link_target): ?>
+    <div id="skip-link">
+      <?php print $jump_link_target; ?>
+    </div>
+  <?php endif; ?>
   <?php print $page_top; ?>
   <?php print $page; ?>
   <?php print $page_bottom; ?>
