diff --git a/helpers.php b/helpers.php
index 4174100e..252c18f4 100644
--- a/helpers.php
+++ b/helpers.php
@@ -117,7 +117,7 @@ if ( ! function_exists( 'sp_post_checklist' ) ) {
 			global $post_id;
 		$obj = get_post_type_object( $meta );
 		?>
-		<div id="<?php echo $meta; ?>-all" class="wp-tab-panel" style="display: <?php echo $display; ?>;">
+		<div id="<?php echo $meta; ?>-all" class="wp-tab-panel sp-tab-panel" style="display: <?php echo $display; ?>;">
 			<input type="hidden" value="0" name="sportspress[<?php echo $meta; ?>]" />
 			<ul class="categorychecklist form-no-clear">
 				<?php
diff --git a/sportspress-admin.js b/sportspress-admin.js
index 096711eb..1db30435 100644
--- a/sportspress-admin.js
+++ b/sportspress-admin.js
@@ -1,5 +1,5 @@
 jQuery(document).ready(function($){
-	$('#sportspress-tabs a').click(function() {
+	$('.sp-tab-panel').siblings('.wp-tab-bar').find('a').click(function() {
 		$(this).closest('li').removeClass('wp-tab').addClass('wp-tab-active').siblings().removeClass('wp-tab-active').addClass('wp-tab').closest('.wp-tab-bar').siblings($(this).attr('href')).show().siblings('.wp-tab-panel').hide();
 		return false;
 	});