From f15a1148a42042c30d2414a28ed4cb6ec7d70768 Mon Sep 17 00:00:00 2001
From: _Neo_ <ursamajorjanus2819@gmail.com>
Date: Sun, 7 Dec 2025 14:04:15 +0200
Subject: [PATCH] Further fixing some Amiibo shenanigans

---
 src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
index 3b5f7f8e4..b76b61b08 100644
--- a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
@@ -336,7 +336,11 @@ namespace Ryujinx.Ava.UI.ViewModels
                 }
             }
 
-            if (LastScannedAmiiboId != string.Empty)
+            if (ShowAllAmiibo && _amiiboSeries.Count > 0)
+            {
+                SeriesSelectedIndex = 0;
+            }
+            else if (LastScannedAmiiboId != string.Empty)
             {
                 SelectLastScannedAmiibo();
             }
@@ -412,6 +416,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             AmiiboSelectedIndex = restoredIndex != -1 ? restoredIndex : (_amiibos.Count > 0 ? 0 : -1);
         }
+        
         private void SetAmiiboDetails()
         {
             ResetAmiiboPreview();