diff --git a/react/src/MainPage.tsx b/react/src/MainPage.tsx
index 486e798..28880d2 100644
--- a/react/src/MainPage.tsx
+++ b/react/src/MainPage.tsx
@@ -195,7 +195,16 @@ export const MainPage =
             }
             onPedalBoardChanged(value: PedalBoard) {
                 let selectedItem = -1;
-                if (value.items.length !== 0)
+                for (let i = 0; i < value.items.length; ++i)
+                {
+                    if (this.state.selectedPedal == value.items[i].instanceId)
+                    {
+                        selectedItem = this.state.selectedPedal;
+                        break;
+                    }
+                }
+                // if no selection the current pedalboard, reset to the first item.
+                if (selectedItem == -1)
                 {
                     selectedItem = value.items[0].instanceId;
                 }