diff --git a/admin/widgets/events-calendar.php b/admin/widgets/events-calendar.php
index df301fcd..59fae5b3 100644
--- a/admin/widgets/events-calendar.php
+++ b/admin/widgets/events-calendar.php
@@ -55,7 +55,7 @@ class SportsPress_Widget_Events_Calendar extends WP_Widget {
 		?>
 		</p>
 
-		<p><input class="checkbox sp-events-calendar-show-all-toggle" type="checkbox" id="<?php echo $this->get_field_id('show_all_events_link'); ?>" name="<?php echo $this->get_field_name('show_all_events_link'); ?>" value="1" <?php checked( $show_all_events_link, 1 ); ?> <?php disabled( true, ( ! $id ) ); ?>>
+		<p class="sp-events-calendar-show-all-toggle<?php if ( ! $id ): ?> hidden<?php endif; ?>"><input class="checkbox" type="checkbox" id="<?php echo $this->get_field_id('show_all_events_link'); ?>" name="<?php echo $this->get_field_name('show_all_events_link'); ?>" value="1" <?php checked( $show_all_events_link, 1 ); ?>>
 		<label for="<?php echo $this->get_field_id('show_all_events_link'); ?>"><?php _e( 'Display link to view all events', 'sportspress' ); ?></label></p>
 <?php
 	}
diff --git a/admin/widgets/events-list.php b/admin/widgets/events-list.php
index 91c7e264..fd3b9183 100644
--- a/admin/widgets/events-list.php
+++ b/admin/widgets/events-list.php
@@ -73,7 +73,7 @@ class SportsPress_Widget_Events_List extends WP_Widget {
 			<?php endforeach; ?>
 		</p>
 
-		<p><input class="checkbox sp-events-calendar-show-all-toggle" type="checkbox" id="<?php echo $this->get_field_id('show_all_events_link'); ?>" name="<?php echo $this->get_field_name('show_all_events_link'); ?>" value="1" <?php checked( $show_all_events_link, 1 ); ?> <?php disabled( true, ( ! $id ) ); ?>>
+		<p class="sp-events-calendar-show-all-toggle<?php if ( ! $id ): ?> hidden<?php endif; ?>"><input class="checkbox" type="checkbox" id="<?php echo $this->get_field_id('show_all_events_link'); ?>" name="<?php echo $this->get_field_name('show_all_events_link'); ?>" value="1" <?php checked( $show_all_events_link, 1 ); ?>>
 		<label for="<?php echo $this->get_field_id('show_all_events_link'); ?>"><?php _e( 'Display link to view all events', 'sportspress' ); ?></label></p>
 <?php
 	}
diff --git a/assets/js/admin.js b/assets/js/admin.js
index ca9900b1..30c665ee 100644
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
@@ -38,7 +38,11 @@ jQuery(document).ready(function($){
 
 	// Calendar affects view all link checkbox in widget options
 	$("body.widgets-php").on("change", ".sp-events-calendar-select", function() {
-		$(this).closest(".widget-content").find(".sp-events-calendar-show-all-toggle").prop("disabled", $(this).val() == 0);
+		$el = $(this).closest(".widget-content").find(".sp-events-calendar-show-all-toggle");
+		if($(this).val() == 0)
+			$el.hide();
+		else
+			$el.show();
 	});
 
 	// Tab switcher