diff --git a/assets/js/admin/sportspress-admin.js b/assets/js/admin/sportspress-admin.js
index 850087d1..6c604f61 100644
--- a/assets/js/admin/sportspress-admin.js
+++ b/assets/js/admin/sportspress-admin.js
@@ -457,12 +457,6 @@ jQuery(document).ready(function($){
 	// Trigger player list layout change
 	$(".post-type-sp_list #post-formats-select input.post-format").trigger("change");
 
-	// Auto-select hides options
-	$(".sp-select-setting").find("select").change(function() {
-		$(".sp-select-all-range").toggle("manual"==$(this).val());
-		$(this).closest(".sp-select-setting").siblings(".sp-tab-select").find("select").change()
-	});
-
 	// Configure primary result option (Ajax)
 	$(".sp-admin-config-table").on("click", ".sp-primary-result-option", function() {
 		$.post( ajaxurl, {
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-details.php
index b892371b..8439099a 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-details.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-details.php
@@ -91,8 +91,10 @@ class SP_Meta_Box_List_Details {
 				</select>
 			</p>
 			<?php
-			sp_post_checklist( $post->ID, 'sp_player', ( 'auto' == $select ? 'none' : 'block' ), array( 'sp_league', 'sp_season', 'sp_current_team' ) );
-			sp_post_adder( 'sp_player', __( 'Add New', 'sportspress' ) );
+			if ( 'manual' == $select ) {
+				sp_post_checklist( $post->ID, 'sp_player', ( 'auto' == $select ? 'none' : 'block' ), array( 'sp_league', 'sp_season', 'sp_current_team' ) );
+				sp_post_adder( 'sp_player', __( 'Add New', 'sportspress' ) );
+			}
 			?>
 		</div>
 		<?php
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-details.php
index b0eb97b3..e2231353 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-details.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-details.php
@@ -43,8 +43,10 @@ class SP_Meta_Box_Table_Details {
 				</select>
 			</p>
 			<?php
-			sp_post_checklist( $post->ID, 'sp_team', ( 'auto' == $select ? 'none' : 'block' ), array( 'sp_league', 'sp_season' ) );
-			sp_post_adder( 'sp_team', __( 'Add New', 'sportspress' ) );
+			if ( 'manual' == $select ) {
+				sp_post_checklist( $post->ID, 'sp_team', ( 'auto' == $select ? 'none' : 'block' ), array( 'sp_league', 'sp_season' ) );
+				sp_post_adder( 'sp_team', __( 'Add New', 'sportspress' ) );
+			}
 			?>
 		</div>
 		<?php