diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs
index 66764805..123b8440 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -1472,18 +1472,7 @@ namespace Volian.Controls.Library
 			try
 			{
 				LastSearchWasAnnotations = false; // B2019-119 only refresh annotation search results if an annotation search was done
-				if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
-				{
-					lbSrchResults.DataSource = null;
-					lbSrchResults.Items.Clear();
-					toolTip1.SetToolTip(lbSrchResults, null);
-				}
-				else        // C2020-033: Incoming Transiiotns
-				{
-					lbSrchResultsIncTrans.DataSource = null;
-					lbSrchResultsIncTrans.Items.Clear();
-					toolTip1.SetToolTip(lbSrchResultsIncTrans, null);
-				}
+				ClearResults();
 				Cursor = Cursors.WaitCursor;
 				SearchResults = null;
 				bool includeRTFformat = false;
@@ -1686,6 +1675,23 @@ namespace Volian.Controls.Library
 			//if (VlnSettings.DebugMode)
 			//    MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds));
 		}
+
+		private void ClearResults()		// B2021-103 if no results when RNO only, clear results list.  (moved from btnSearch_Click)
+		{
+			if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
+			{
+				lbSrchResults.DataSource = null;
+				lbSrchResults.Items.Clear();
+				toolTip1.SetToolTip(lbSrchResults, null);
+			}
+			else        // C2020-033: Incoming Transiiotns
+			{
+				lbSrchResultsIncTrans.DataSource = null;
+				lbSrchResultsIncTrans.Items.Clear();
+				toolTip1.SetToolTip(lbSrchResultsIncTrans, null);
+			}
+		}
+
 		// C2019-001: Search in RNO steps only
 		private void GetInRNOResults()
 		{
@@ -1711,6 +1717,7 @@ namespace Volian.Controls.Library
 			if (SearchResults == null || SearchResults.Count == 0)
 			{
 				FlexibleMessageBox.Show("No Matches Found.", "Search");
+				ClearResults();		// B2021-103 Clear results list if none found.
 			}
 		}
 		private void AddMessageForEmptyAnnotations()