diff --git a/UI/BSSFlowCoordinator.cs b/UI/BSSFlowCoordinator.cs
index ed43636..e3c69a2 100644
--- a/UI/BSSFlowCoordinator.cs
+++ b/UI/BSSFlowCoordinator.cs
@@ -145,11 +145,10 @@ public static void Close(bool immediately = false, bool downloadAbortConfim = tr
 				XD.FunnyMono(SelectedSongView.songPreviewPlayer)?.CrossfadeToDefault();
 			} catch { }
 
-			foreach(var x in filterView.GetComponentsInChildren<ModalView>())
-				x.Hide(false);
-
-			foreach(var x in songListView.GetComponentsInChildren<ModalView>())
+			foreach(var x in filterView.GetComponentsInChildren<ModalView>().Concat(songListView.GetComponentsInChildren<ModalView>())) {
 				x.Hide(false);
+				x.gameObject.SetActive(false);
+			}
 
 			if(downloadHistoryView.hasUnloadedDownloads)
 				SongCore.Loader.Instance.RefreshSongs(false);
diff --git a/UI/DownloadHistoryView.cs b/UI/DownloadHistoryView.cs
index 9f94836..0d7a7ed 100644
--- a/UI/DownloadHistoryView.cs
+++ b/UI/DownloadHistoryView.cs
@@ -185,7 +185,7 @@ public bool IsInAnyOfStates(DownloadStatus states) {
 			}
 
 			public void ResetIfFailed() {
-				if(status != DownloadStatus.Failed || retries != RETRY_COUNT)
+				if(status != DownloadStatus.Failed || retries < RETRY_COUNT)
 					return;
 
 				status = DownloadStatus.Queued;