diff --git a/js/bookmark.js b/js/bookmark.js
index eea3119..5fd5c2e 100644
--- a/js/bookmark.js
+++ b/js/bookmark.js
@@ -36,35 +36,37 @@ Event.observe(window, 'load', function() {
   var bookmark_info = new BookmarkInfo();
   var info = bookmark_info.read();
 
-  var hrefs = {};
-  $$('#comic-bookmark-holder a').each(function(a) {
-    var name = $w(a.className).shift();
-    hrefs[name] = a;
-  });
+  if ($('comic-bookmark-holder')) {
+	  var hrefs = {};
+	  $$('#comic-bookmark-holder a').each(function(a) {
+	    var name = $w(a.className).shift();
+	    hrefs[name] = a;
+	  });
 
-  var set_goto_tag = function(i) {
-    hrefs['goto-tag'].href = (i.permalink ? i.permalink : "#");
-    [ 'goto-tag','clear-tag' ].each(function(which) {
-      hrefs[which].select('img')[0].src = image_root + button_images[which][i.permalink ? "on" : "off"];
-    });
-  };
+	  var set_goto_tag = function(i) {
+	    hrefs['goto-tag'].href = (i.permalink ? i.permalink : "#");
+	    [ 'goto-tag','clear-tag' ].each(function(which) {
+	      hrefs[which].select('img')[0].src = image_root + button_images[which][i.permalink ? "on" : "off"];
+	    });
+	  };
 
-  bookmark_info.onWrite = function(i) { set_goto_tag(i); }
-  set_goto_tag(info);
+	  bookmark_info.onWrite = function(i) { set_goto_tag(i); }
+	  set_goto_tag(info);
 
-  Event.observe(hrefs['tag-page'], 'click', function(e) {
-    Event.stop(e);
-    info.permalink = permalink;
-    bookmark_info.write(info);
-  });
+	  Event.observe(hrefs['tag-page'], 'click', function(e) {
+	    Event.stop(e);
+	    info.permalink = permalink;
+	    bookmark_info.write(info);
+	  });
 
-  Event.observe(hrefs['clear-tag'], 'click', function(e) {
-    Event.stop(e);
-    info.permalink = false;
-    bookmark_info.write(info);
-  });
+	  Event.observe(hrefs['clear-tag'], 'click', function(e) {
+	    Event.stop(e);
+	    info.permalink = false;
+	    bookmark_info.write(info);
+	  });
 
-  Event.observe(hrefs['goto-tag'], 'click', function(e) {
-    if (hrefs['goto-tag'].href == "#") { Event.stop(e); }
-  });
+	  Event.observe(hrefs['goto-tag'], 'click', function(e) {
+	    if (hrefs['goto-tag'].href == "#") { Event.stop(e); }
+	  });
+  }
 });
diff --git a/sidebar-right.php b/sidebar-right.php
index 61bcac6..67a96d3 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -4,6 +4,9 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
 	<div class="sidebar-head"></div>
 		<div class="sidebar">
 			<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right Sidebar') ) : ?>
+				<?php
+					comicpress_comic_bookmark()
+				?>
 				<?php if (is_cp_theme_layout('standard,v')) { ?>
 					<div class="widget">
 						<?php comicpress_calendar(); ?>
diff --git a/widgets/BookmarkWidget.inc b/widgets/BookmarkWidget.inc
index f0b745b..b2e4648 100644
--- a/widgets/BookmarkWidget.inc
+++ b/widgets/BookmarkWidget.inc
@@ -32,5 +32,3 @@ class BookmarkWidget extends WP_Widget {
     <?php
   }
 }
-
-?>