diff --git a/indra/newview/ao.cpp b/indra/newview/ao.cpp
index 0fdfeaeb67..43ceb3e0f9 100644
--- a/indra/newview/ao.cpp
+++ b/indra/newview/ao.cpp
@@ -341,10 +341,14 @@ void FloaterAO::onSelectSet()
 		return;
 	}
 	
-	mSelectedSet=set;
+	// only update the interface when we actually selected a different set - FIRE-29542
+	if (mSelectedSet != set)
+	{
+		mSelectedSet=set;
 
-	updateSetParameters();
-	updateAnimationList();
+		updateSetParameters();
+		updateAnimationList();
+	}
 }
 
 void FloaterAO::onSelectSetSmall()