diff --git a/js/components/MilkdropWindow/PresetOverlay.tsx b/js/components/MilkdropWindow/PresetOverlay.tsx
index 878271f2..36e56356 100644
--- a/js/components/MilkdropWindow/PresetOverlay.tsx
+++ b/js/components/MilkdropWindow/PresetOverlay.tsx
@@ -75,6 +75,12 @@ class PresetOverlay extends React.Component<Props, State> {
       // _Also_ ideally we could avoid this prop all together.
       this.props.onFocusedKeyDown(this._handleFocusedKeyboardInput)
     );
+    const { currentPresetIndex } = this.props;
+    if (currentPresetIndex != null) {
+      this.setState({
+        selectedListIndex: this._listIndexFromPresetIndex(currentPresetIndex)
+      });
+    }
   }
 
   componentWillUnmount() {