diff --git a/indra/aistatemachine/aistatemachinethread.cpp b/indra/aistatemachine/aistatemachinethread.cpp
index f45d1e845..caeddea5c 100644
--- a/indra/aistatemachine/aistatemachinethread.cpp
+++ b/indra/aistatemachine/aistatemachinethread.cpp
@@ -101,7 +101,10 @@ void AIStateMachineThreadBase::multiplex_impl(state_type run_state)
 	  break;
 	case wait_stopped:
 	  if (!mThread->isStopped())
+	  {
+		yield();
 		break;
+	  }
 	  // We're done!
 	  //
 	  // We can only get here when AIThreadImpl::done called cont(), (very
diff --git a/indra/newview/statemachine/aifilepicker.cpp b/indra/newview/statemachine/aifilepicker.cpp
index 418d83955..3cc3ccbcd 100644
--- a/indra/newview/statemachine/aifilepicker.cpp
+++ b/indra/newview/statemachine/aifilepicker.cpp
@@ -420,6 +420,7 @@ void AIFilePicker::multiplex_impl(state_type run_state)
 			// Store folder of first filename as context.
 			AIFilePicker::store_folder(mContext, getFolder());
 			finish();
+			break;
 		}
 	}
 }