diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs
index 61b4776..d4759f8 100644
--- a/PrimaryFormParts/PrimaryForm.cs
+++ b/PrimaryFormParts/PrimaryForm.cs
@@ -2963,16 +2963,39 @@ public class MultiPagePanel : Panel
         /// <param name="controls"></param>
         private void FindFirstNonEmptyText(params Control[] controls)
         {
+            var searchActions = new Dictionary<Control, Action>
+            {
+                { inputBoxZhuYinSingers, FindZhuYiSingers },
+                { inputBoxZhuYinSongs, FindZhuYiSongs },
+                { inputBoxEnglishSingers, FindEnglishSingers },
+                { inputBoxEnglishSongs, FindEnglishSongs },
+                { inputBoxPinYinSingers, FindPinYinSingers },
+                { inputBoxPinYinSongs, FindPinYinSongs },
+                { inputBoxWordCountSingers, FindWordCountSingers },
+                { inputBoxWordCountSongs, FindWordCountSongs },
+                { inputBoxSongIDSearch, FindNumberSongs },
+                { handwritingInputBoxForSongs, FindHandwritingSongs },
+                { handwritingInputBoxForSingers, FindHandwritingSingers },
+            };
+
             foreach (var control in controls)
             {
                 if (!string.IsNullOrEmpty(control.Text))
-                {   
+                {
                     var temp = control.Text;
-                    ResetinputBox();
-                    control.Text = temp;
+                    ResetinputBox();          // 清除所有輸入框
+                    control.Text = temp;      // 還原唯一有內容的那個
+
+                    if (searchActions.TryGetValue(control, out var action))
+                    {
+                        action.Invoke();      // 執行對應的查詢方法
+                    }
+
+                    break; // 只處理第一個有文字的輸入框
                 }
             }
         }
+
         /// <summary>
         ///  重置所有輸入框
         /// </summary>
diff --git a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.BopomofoSearch.cs b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.BopomofoSearch.cs
index 139a5b0..9e79b04 100644
--- a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.BopomofoSearch.cs
+++ b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.BopomofoSearch.cs
@@ -515,11 +515,11 @@ namespace DualScreenDemo
             pictureBoxZhuYinSingers.Visible = false;
             // 關閉注音搜尋的按鈕顏色
             zhuyinSearchButton.BackgroundImage = zhuyinSearchNormalBackground;
-            FindBopomofoSingers();
+            FindZhuYiSingers();
             // 隱藏與 ZhuYin 歌手相關的所有按鈕
             SetZhuYinSingersAndButtonsVisibility(false);
         }
-        private void FindBopomofoSingers(){
+        private void FindZhuYiSingers(){
                 string searchText = inputBoxZhuYinSingers.Text;
                 string query = $"SELECT * FROM ArtistLibrary WHERE `歌手注音` LIKE '{searchText}%' ";
                 var searchResults = SearchSingers_Mysql(query);