diff --git vud.theme.inc vud.theme.inc
index db53654..b273852 100644
--- vud.theme.inc
+++ vud.theme.inc
@@ -230,6 +230,8 @@ function vud_widget_proxy($content_id, $type, $tag, $widget_theme, $readonly=NUL
   $link_down = url("vote/$type/$content_id/-1/$tag/$widget_theme/$token_down");
   $message_on_deny = variable_get('vud_message_on_deny', FALSE);
   $variables['show_links'] = !$readonly || $message_on_deny;
+  $variables['show_up_as_link'] = $variables['show_links'] && ($user_vote <= 0);
+  $variables['show_down_as_link'] = $variables['show_links'] && ($user_vote >= 0);
   if ($readonly) {
     $variables['link_class_up'] .= ' denied';
     $variables['link_class_down'] .= ' denied';
diff --git widgets/alternate/widget.tpl.php widgets/alternate/widget.tpl.php
index 768b47d..a8aceeb 100644
--- widgets/alternate/widget.tpl.php
+++ widgets/alternate/widget.tpl.php
@@ -11,10 +11,14 @@
   <?php if ($class_up) : ?>
     <div class="alternate-votes-display"><?php print $unsigned_points; ?></div>
     <?php if ($show_links): ?>
-      <a href="<?php print $link_up; ?>" rel="nofollow" class="<?php print $link_class_up; ?>">
-        <div class="<?php print $class_up; ?>" title="<?php print t('Vote up!'); ?>"></div>
-        <div class="element-invisible"><?php print t('Vote up!'); ?></div>
-      </a>
+      <?php if ($show_up_as_link): ?>
+        <a href="<?php print $link_up; ?>" rel="nofollow" class="<?php print $link_class_up; ?>">
+      <?php endif; ?>
+          <div class="<?php print $class_up; ?>" title="<?php print t('Vote up!'); ?>"></div>
+          <div class="element-invisible"><?php print t('Vote up!'); ?></div>
+      <?php if ($show_up_as_link): ?>
+        </a>
+      <?php endif; ?>
     <?php endif; ?>
   <?php endif; ?>
 </div>
diff --git widgets/plain/widget.tpl.php widgets/plain/widget.tpl.php
index b0a9624..e4b7e43 100644
--- widgets/plain/widget.tpl.php
+++ widgets/plain/widget.tpl.php
@@ -9,13 +9,21 @@
 ?>
 <?php if ($show_links): ?>
   <div class="vud-widget vud-widget-plain" id="<?php print $id; ?>">
-    <a href="<?php print $link_up; ?>" rel="nofollow" class="<?php print $link_class_up; ?>">
-      <span class="<?php print $class_up; ?>" title="<?php print t('Vote up!'); ?>"></span>
-      <div class="element-invisible"><?php print t('Vote up!'); ?></div>
-    </a>
-    <a href="<?php print $link_down; ?>" rel="nofollow" class="<?php print $link_class_down; ?>">
-      <span class="<?php print $class_down; ?>" title="<?php print t('Vote down!'); ?>"></span>
-      <div class="element-invisible"><?php print t('Vote down!'); ?></div>
-    </a>
+    <?php if ($show_up_as_link): ?>
+      <a href="<?php print $link_up; ?>" rel="nofollow" class="<?php print $link_class_up; ?>">
+    <?php endif; ?>
+        <span class="<?php print $class_up; ?>" title="<?php print t('Vote up!'); ?>"></span>
+        <div class="element-invisible"><?php print t('Vote up!'); ?></div>
+    <?php if ($show_up_as_link): ?>
+      </a>
+    <?php endif; ?>
+    <?php if ($show_down_as_link): ?>
+      <a href="<?php print $link_down; ?>" rel="nofollow" class="<?php print $link_class_down; ?>">
+    <?php endif; ?>
+        <span class="<?php print $class_down; ?>" title="<?php print t('Vote down!'); ?>"></span>
+        <div class="element-invisible"><?php print t('Vote down!'); ?></div>
+    <?php if ($show_down_as_link): ?>
+      </a>
+    <?php endif; ?>
   </div>
 <?php endif; ?>
diff --git widgets/upanddown/widget.tpl.php widgets/upanddown/widget.tpl.php
index 761c86b..97cc5e5 100644
--- widgets/upanddown/widget.tpl.php
+++ widgets/upanddown/widget.tpl.php
@@ -6,6 +6,7 @@
  * widget.tpl.php
  *
  * UpAndDown widget theme for Vote Up/Down
+ * TODO use $show_up_as_link and $show_down_as_link
  */
 ?>
 <div class="vud-widget vud-widget-upanddown" id="<?php print $id; ?>">
diff --git widgets/updown/updown.css widgets/updown/updown.css
index 30744ea..0314e36 100644
--- widgets/updown/updown.css
+++ widgets/updown/updown.css
@@ -43,12 +43,12 @@
   font-size: 20px;
 }
 
-.vud-widget-updown .vud-link-up div {
+.vud-widget-updown div.updown-up {
   float: left;
   margin-right: 3px;
 }
 
-.vud-widget-updown .vud-link-down div {
+.vud-widget-updown div.updown-down {
   float: left;
   margin-left: 3px;
 }
diff --git widgets/updown/widget.tpl.php widgets/updown/widget.tpl.php
index d721d85..67714db 100644
--- widgets/updown/widget.tpl.php
+++ widgets/updown/widget.tpl.php
@@ -14,13 +14,21 @@
     <?php print $vote_label; ?>
   </div>
   <?php if ($show_links): ?>
-    <a href="<?php print $link_up; ?>" rel="nofollow" class="<?php print $link_class_up; ?>">
-      <div class="<?php print $class_up; ?>" title="<?php print t('Vote up!'); ?>">+</div>
-      <div class="element-invisible"><?php print t('Vote up!'); ?></div>
-    </a>
-    <a href="<?php print $link_down; ?>" rel="nofollow" class="<?php print $link_class_down; ?>">
-      <div class="<?php print $class_down; ?>" title="<?php print t('Vote down!'); ?>">-</div>
-      <div class="element-invisible"><?php print t('Vote down!'); ?></div>
-    </a>
+    <?php if ($show_up_as_link): ?>
+      <a href="<?php print $link_up; ?>" rel="nofollow" class="<?php print $link_class_up; ?>">
+    <?php endif; ?>
+        <div class="<?php print $class_up; ?> updown-up" title="<?php print t('Vote up!'); ?>">+</div>
+        <div class="element-invisible"><?php print t('Vote up!'); ?></div>
+    <?php if ($show_up_as_link): ?>
+      </a>
+    <?php endif; ?>
+    <?php if ($show_down_as_link): ?>
+      <a href="<?php print $link_down; ?>" rel="nofollow" class="<?php print $link_class_down; ?>">
+    <?php endif; ?>
+        <div class="<?php print $class_down; ?> updown-down" title="<?php print t('Vote down!'); ?>">-</div>
+        <div class="element-invisible"><?php print t('Vote down!'); ?></div>
+    <?php if ($show_down_as_link): ?>
+      </a>
+    <?php endif; ?>
   <?php endif; ?>
 </div>