diff --git a/react/public/var/config.json b/react/public/var/config.json
index 93f81dd..60e144f 100644
--- a/react/public/var/config.json
+++ b/react/public/var/config.json
@@ -1,5 +1,5 @@
 {
-   "socket_server_port": 8080,
+   "socket_server_port": 80,
    "socket_server_address": "*",
 
     "max_upload_size": 1048576,
diff --git a/react/src/MainPage.tsx b/react/src/MainPage.tsx
index 36af67d..486e798 100644
--- a/react/src/MainPage.tsx
+++ b/react/src/MainPage.tsx
@@ -114,11 +114,17 @@ export const MainPage =
             constructor(props: MainProps) {
                 super(props);
                 this.model = PiPedalModelFactory.getInstance();
+                let pedalboard = this.model.pedalBoard.get();
+                let selectedPedal = -1;
+                if (pedalboard.items.length !== 0)
+                {
+                    selectedPedal = pedalboard.items[0].instanceId;
+                }
 
                 this.state = {
-                    selectedPedal: -1,
+                    selectedPedal: selectedPedal,
                     loadDialogOpen: false,
-                    pedalBoard: this.model.pedalBoard.get(),
+                    pedalBoard: pedalboard,
                     addMenuAnchorEl: null,
                     splitControlBar: this.windowSize.width < SPLIT_CONTROLBAR_THRESHHOLD,
                     horizontalScrollLayout: this.windowSize.height < HORIZONTAL_CONTROL_SCROLL_HEIGHT_BREAK,
@@ -188,7 +194,15 @@ export const MainPage =
                 this.model.loadPluginPreset(instanceId, presetInstanceId);
             }
             onPedalBoardChanged(value: PedalBoard) {
-                this.setState({ pedalBoard: value });
+                let selectedItem = -1;
+                if (value.items.length !== 0)
+                {
+                    selectedItem = value.items[0].instanceId;
+                }
+                this.setState({ 
+                    pedalBoard: value,
+                    selectedPedal: selectedItem
+                 });
             }
             onDeletePedal(instanceId: number): void {
                 let result = this.model.deletePedalBoardPedal(instanceId);