diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 79587bba6..a64dca6e4 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -247,7 +247,9 @@ $.widget( "ui.tabs", {
 			if ( panel.length) {
 				that.panels = that.panels.add( panel );
 			}
-			tab.attr( "aria-controls", selector.substring( 1 ) );
+			tab
+				.data( "ui-tabs-aria-controls", tab.attr( "aria-controls" ) )
+				.attr( "aria-controls", selector.substring( 1 ) );
 		});
 	},
 
@@ -488,8 +490,17 @@ $.widget( "ui.tabs", {
 					"ui-tabs-panel",
 					"ui-widget-content",
 					"ui-corner-bottom"
-				].join( " " ) )
-				.removeAttr( "aria-controls" );
+				].join( " " ) );
+			}
+		});
+
+		this.lis.each(function() {
+			var li = $( this ),
+				prev = li.data( "ui-tabs-aria-controls" );
+			if ( prev ) {
+				li.attr( "aria-controls", prev );
+			} else {
+				li.removeAttr( "aria-controls" );
 			}
 		});