diff --git a/sidebar-right.php b/sidebar-right.php
index b3b9808..cb5e507 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -10,6 +10,9 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
 				the_widget('ComicPressCalendarWidget');
 				the_widget('ComicpressArchiveDropdownWidget','mode=monthly_archive');
 			}
+			if ($comicpress_options['disable_comic_frontpage']) {
+				the_widget('ComicPressLatestThumbnailWidget');
+			}
 			the_widget('WP_Widget_Search');
 			the_widget('WP_Widget_Pages');
 			the_widget('WP_Widget_Categories','hierarchical=1&count=1');
diff --git a/widgets/MenubarWidget.inc b/widgets/MenubarWidget.inc
index a829c69..3948f6b 100644
--- a/widgets/MenubarWidget.inc
+++ b/widgets/MenubarWidget.inc
@@ -34,7 +34,7 @@ class ComicPressMenubarWidget extends WP_Widget {
 					<a href="<?php bloginfo('rss2_url') ?>" title="RSS Feed" class="menunav-rss">RSS</a>
 				<?php } ?>
 				<?php if ($comicpress_options['enable_navigation_in_menubar']) { ?>
-					<?php if (is_home()) {
+					<?php if (is_home() && !$comicpress_options['disable_comic_frontpage']) {
 						$comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
 						while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
 							global $wp_query; $wp_query->is_single = true; ?>
@@ -43,7 +43,7 @@ class ComicPressMenubarWidget extends WP_Widget {
 							</div>
 							<?php $wp_query->is_single = false;
 						endwhile; 
-					} elseif (is_single() & in_comic_category()) { ?>
+					} elseif (is_single() && in_comic_category()) { ?>
 						<div class="menunav-prev">
 						<?php previous_comic_link('%link', '&lsaquo;'); ?>
 						</div>