Update ui.py

ui.py

@@ -267,41 +267,52 @@ def render_speaker_samples_tab(speakerNames, raw_to_display, currFile):
                     "</style>",
                     unsafe_allow_html=True,
                 )
+                # The selectbox MUST live outside the form: inside a form,
+                # widget state is only committed on submit, so choosing
+                # _NEW_OPTION would never make the text input appear until
+                # after an unrelated submit.  We track the live choice in
+                # chosen_key and only put the text input + buttons in the form.
+                chosen_key = f"inline_rename_chosen_{currFile}_{sp}"
+                show_input = False
+                new_name   = ""
+
+                if history:
+                    options = history + [_NEW_OPTION]
+                    default_idx = (
+                        history.index(current_val) if current_val in history
+                        else len(options) - 1
+                    )
+                    if chosen_key not in st.session_state:
+                        st.session_state[chosen_key] = options[default_idx]
+                    # Clamp stored value in case history changed
+                    if st.session_state[chosen_key] not in options:
+                        st.session_state[chosen_key] = options[default_idx]
+                    st.selectbox(
+                        "Rename",
+                        options=options,
+                        key=chosen_key,
+                        label_visibility="collapsed",
+                    )
+                    chosen = st.session_state[chosen_key]
+                    show_input = (chosen == _NEW_OPTION)
+                    if not show_input:
+                        new_name = chosen
+
                 with st.form(key=form_key, border=False):
-                    if history:
-                        options = history + [_NEW_OPTION]
-                        default_idx = (
-                            history.index(current_val) if current_val in history
-                            else len(options) - 1
-                        )
-                        st.selectbox(
+                    if not history:
+                        # No history — plain text input is the only field
+                        new_name = st.text_input(
                             "Rename",
-                            options=options,
-                            index=default_idx,
-                            key=select_key,
+                            value=current_val,
+                            key=input_key,
                             label_visibility="collapsed",
+                            placeholder=f"Rename {sp}…",
                         )
-                        # Read the CURRENT widget value from session_state so that
-                        # selecting _NEW_OPTION is reflected immediately on this run,
-                        # even though st.selectbox() inside a form returns the
-                        # previous-run value until the form is submitted.
-                        chosen = st.session_state.get(select_key, options[default_idx])
-                        if chosen == _NEW_OPTION:
-                            new_name = st.text_input(
-                                "New name",
-                                value="",
-                                key=input_key,
-                                label_visibility="collapsed",
-                                placeholder=f"Rename {sp}…",
-                            )
-                        else:
-                            new_name = chosen
-                            st.session_state.pop(input_key, None)
-                    else:
-                        # No history yet — just a plain text input
+                    elif show_input:
+                        # User picked "+ Enter a new name" — show free-text field
                         new_name = st.text_input(
-                            "Rename",
-                            value=current_val,
+                            "New name",
+                            value="",
                             key=input_key,
                             label_visibility="collapsed",
                             placeholder=f"Rename {sp}…",
@@ -312,27 +323,25 @@ def render_speaker_samples_tab(speakerNames, raw_to_display, currFile):
                     cancel_clicked   = btn_col2.form_submit_button("✕", help="Cancel")
                     reset_clicked    = btn_col3.form_submit_button("⟳", help="Reset to original speaker label")
 
+                    def _cleanup():
+                        st.session_state.inline_rename_active[edit_key] = False
+                        st.session_state.pop(select_key, None)
+                        st.session_state.pop(chosen_key, None)
+                        st.session_state.pop(input_key, None)
+
                     if confirmed_submit:
                         confirmed = (new_name or "").strip()
                         apply_inline_rename(currFile, sp, confirmed)
                         if confirmed and confirmed not in st.session_state.inline_rename_history:
                             st.session_state.inline_rename_history.append(confirmed)
-                        st.session_state.inline_rename_active[edit_key] = False
-                        st.session_state.pop(select_key, None)
-                        st.session_state.pop(input_key, None)
+                        _cleanup()
                         st.rerun()
                     if cancel_clicked:
-                        st.session_state.inline_rename_active[edit_key] = False
-                        st.session_state.pop(select_key, None)
-                        st.session_state.pop(input_key, None)
+                        _cleanup()
                         st.rerun()
                     if reset_clicked:
-                        # Revert to raw speaker label — same as removing the token
-                        # from a rename entry in the sidebar
                         apply_inline_rename(currFile, sp, "")
-                        st.session_state.inline_rename_active[edit_key] = False
-                        st.session_state.pop(select_key, None)
-                        st.session_state.pop(input_key, None)
+                        _cleanup()
                         st.rerun()
         else:
             with row_cols[0]: