diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs
index c9a48a4d6..eddaaf1d4 100644
--- a/ShareX.HistoryLib/Forms/HistoryForm.cs
+++ b/ShareX.HistoryLib/Forms/HistoryForm.cs
@@ -423,12 +423,16 @@ private void tsbSearch_Click(object sender, EventArgs e)
 
         private void tsbAdvancedSearch_Click(object sender, EventArgs e)
         {
-            gbAdvancedSearch.Visible = !gbAdvancedSearch.Visible;
+            bool isPanelVisible = gbAdvancedSearch.Visible;
+            gbAdvancedSearch.Visible = !isPanelVisible;
+            tsbAdvancedSearch.Checked = !isPanelVisible;
         }
 
         private void tsbToggleMoreInfo_Click(object sender, EventArgs e)
         {
-            scHistoryItemInfo.Panel2Collapsed = !scHistoryItemInfo.Panel2Collapsed;
+            bool isPanelVisible = !scHistoryItemInfo.Panel2Collapsed;
+            scHistoryItemInfo.Panel2Collapsed = isPanelVisible;
+            tsbToggleMoreInfo.Checked = !isPanelVisible;
         }
 
         private void tsbCopyStats_Click(object sender, EventArgs e)
@@ -472,6 +476,7 @@ private void txtURLFilter_KeyDown(object sender, KeyEventArgs e)
         private void btnAdvancedSearch_Click(object sender, EventArgs e)
         {
             gbAdvancedSearch.Visible = false;
+            tsbAdvancedSearch.Checked = false;
             ApplyFilterAdvanced();
         }