diff --git a/src/ui/elements/forms/InputProps.tsx b/src/ui/elements/forms/InputProps.tsx
index 3951d08..bf16441 100644
--- a/src/ui/elements/forms/InputProps.tsx
+++ b/src/ui/elements/forms/InputProps.tsx
@@ -2,6 +2,7 @@ export type InputProps = {
   name?: string;
   value?: string;
   placeholder?: string;
+  onInput?: () => void;
   onChange?: () => void;
   required?: boolean;
   checked?: boolean;
diff --git a/src/ui/pages/Secrets/KeyValue/KeyValueEdit.tsx b/src/ui/pages/Secrets/KeyValue/KeyValueEdit.tsx
index ddd6c12..55f97b1 100644
--- a/src/ui/pages/Secrets/KeyValue/KeyValueEdit.tsx
+++ b/src/ui/pages/Secrets/KeyValue/KeyValueEdit.tsx
@@ -66,7 +66,7 @@ export class KVEditor extends Component<KVEditProps, KVEditState> {
     this.setState({
       dataLoaded: true,
       kvData: kvData,
-      code: this.getStringKVData(kvData),
+      code: this.getStringKVData(kvData, this.state.syntax),
     });
   }
 
@@ -95,11 +95,11 @@ export class KVEditor extends Component<KVEditProps, KVEditState> {
     }
   }
 
-  getStringKVData(data: Record<string, unknown>): string {
+  getStringKVData(data: Record<string, unknown>, syntax: string): string {
     return dumpData(
       Object.fromEntries(sortedObjectMap(data)),
       this.props.settings.kvEditorIndent,
-      this.state.syntax,
+      syntax,
     );
   }
 
@@ -115,7 +115,8 @@ export class KVEditor extends Component<KVEditProps, KVEditState> {
         <InputWithTitle title={i18next.t("kv_sec_edit_syntax")}>
           <Select
             selectRef={this.syntaxSelectRef}
-            onChange={() => {
+            onInput={() => {
+              console.log(this.syntaxSelectRef.current.value);
               this.setState({ syntax: this.syntaxSelectRef.current.value });
             }}
           >
@@ -138,7 +139,7 @@ export class KVEditor extends Component<KVEditProps, KVEditState> {
         <CodeEditor
           language={toPrismCode(this.state.syntax)}
           tabSize={this.props.settings.kvEditorIndent}
-          code={this.getStringKVData(this.state.kvData)}
+          code={this.getStringKVData(this.state.kvData, this.state.syntax)}
           onUpdate={(code) => {
             this.setState({ code });
           }}
diff --git a/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx b/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
index 2025837..555c0af 100644
--- a/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
+++ b/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
@@ -115,7 +115,7 @@ export class KVKeysList extends Component<KVKeysListProps, KVKeysListState> {
             inputRef={this.searchBarRef}
             name="path"
             placeholder={i18next.t("kv_view_search_input_text")}
-            onChange={async () => {
+            onInput={async () => {
               this.setState({
                 searchQuery: this.searchBarRef.current.value,
               });
diff --git a/src/ui/pages/Secrets/KeyValue/KeyValueNew.tsx b/src/ui/pages/Secrets/KeyValue/KeyValueNew.tsx
index bb1ebcc..ea9d30e 100644
--- a/src/ui/pages/Secrets/KeyValue/KeyValueNew.tsx
+++ b/src/ui/pages/Secrets/KeyValue/KeyValueNew.tsx
@@ -31,7 +31,13 @@ export class KeyValueNew extends Component<DefaultPageProps> {
       }
 
       await this.props.api.createOrUpdateSecret(baseMount, secretPath, path, keyData);
-      route(kvViewURL(baseMount, secretPath, path));
+      if (path.includes("/")) {
+        const split = path.split("/");
+        const secret = split.pop();
+        route(kvViewURL(baseMount, [...secretPath, ...split], secret));
+      } else {
+        route(kvViewURL(baseMount, secretPath, path));
+      }
     } catch (e: unknown) {
       const error = e as Error;
       this.errorMessageRef.current.setErrorMessage(error.message);