diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js
index d54284dd766..c6edfb3e0b2 100644
--- a/assets/js/admin/meta-boxes-product.js
+++ b/assets/js/admin/meta-boxes-product.js
@@ -146,6 +146,11 @@ jQuery( function( $ ) {
 		}
 		if ( is_virtual ) {
 			$( '.show_if_virtual' ).show();
+
+			// If user enables virtual while on shipping tab, switch to general tab.
+			if ( $( '.shipping_options.shipping_tab' ).hasClass( 'active' ) ) {
+				$( '.general_options.general_tab > a' ).trigger( 'click' );
+			}
 		}
 
         $( '.show_if_' + product_type ).show();