diff --git a/.changelog/10569.txt b/.changelog/10569.txt
new file mode 100644
index 000000000..d8aeab7ec
--- /dev/null
+++ b/.changelog/10569.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Ensure in-folder KVs are created in the correct folder
+```
diff --git a/ui/packages/consul-ui/app/components/app-view/index.hbs b/ui/packages/consul-ui/app/components/app-view/index.hbs
index 6197f1b69..a67a5561a 100644
--- a/ui/packages/consul-ui/app/components/app-view/index.hbs
+++ b/ui/packages/consul-ui/app/components/app-view/index.hbs
@@ -54,7 +54,7 @@
       <div>
           <div>
     {{#if authorized}}
-              <nav aria-label="Breadcrumb">
+              <nav aria-label="Breadcrumb" data-test-breadcrumbs>
                   <YieldSlot @name="breadcrumbs">
                     {{document-attrs class="with-breadcrumbs"}}
                     {{yield}}
diff --git a/ui/packages/consul-ui/app/locations/fsm-with-optional.js b/ui/packages/consul-ui/app/locations/fsm-with-optional.js
index 3a307915c..806d664cf 100644
--- a/ui/packages/consul-ui/app/locations/fsm-with-optional.js
+++ b/ui/packages/consul-ui/app/locations/fsm-with-optional.js
@@ -9,7 +9,9 @@ if (env('CONSUL_NSPACES_ENABLED')) {
 }
 
 const trailingSlashRe = /\/$/;
-const moreThan1SlashRe = /\/{2,}/g;
+
+// see below re: ember double slashes
+// const moreThan1SlashRe = /\/{2,}/g;
 
 const _uuid = function() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
@@ -123,15 +125,16 @@ export default class FSMWithOptionalLocation {
   }
 
   getURLFrom(url) {
-    // remove trailing slashes if they exists
+    // remove trailing slashes if they exist
     url = url || this.location.pathname;
     this.rootURL = this.rootURL.replace(trailingSlashRe, '');
     this.baseURL = this.baseURL.replace(trailingSlashRe, '');
     // remove baseURL and rootURL from start of path
     return url
       .replace(new RegExp(`^${this.baseURL}(?=/|$)`), '')
-      .replace(new RegExp(`^${this.rootURL}(?=/|$)`), '')
-      .replace(moreThan1SlashRe, '/'); // remove extra slashes
+      .replace(new RegExp(`^${this.rootURL}(?=/|$)`), '');
+    // ember default locations remove double slashes here e.g. '//'
+    // .replace(moreThan1SlashRe, '/'); // remove extra slashes
   }
 
   getURLForTransition(url) {
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature
index b4f72b732..d63922e3d 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature
@@ -48,3 +48,4 @@ Feature: dc / kvs / create
     And I click kv on the kvs
     And I click create
     And I see the text "New Key / Value" in "h1"
+    And I see the text "key-value" in "[data-test-breadcrumbs] li:nth-child(2) a"