diff --git a/IDE/src/ui/ClassViewPanel.bf b/IDE/src/ui/ClassViewPanel.bf
index 8211dfe6..3088cccc 100644
--- a/IDE/src/ui/ClassViewPanel.bf
+++ b/IDE/src/ui/ClassViewPanel.bf
@@ -13,6 +13,8 @@ namespace IDE.ui
 {
 	class ClassViewPanel : Panel
 	{
+		private static String sLastSearchString = new String() ~ delete _;
+
 		public class ClassViewListViewItem : IDEListViewItem
 		{
 		    public float mLabelOffset;
@@ -407,6 +409,15 @@ namespace IDE.ui
 					{
 						mWantsSubmit = true;
 					});
+
+				mSearchEdit.SetText(sLastSearchString);
+				mSearchEdit.Content.SelectAll();
+
+				findClassDialog.mOnClosed.Add(new () =>
+					{
+						sLastSearchString.Clear();
+						mSearchEdit.GetText(sLastSearchString);
+					});
 			}
 
 		    //mListView.mDragEndHandler.Add(new => HandleDragEnd);