diff --git a/src/Iframes/Configuration/Components/Section.svelte b/src/Iframes/Configuration/Components/Section.svelte
index e11e674..f713712 100644
--- a/src/Iframes/Configuration/Components/Section.svelte
+++ b/src/Iframes/Configuration/Components/Section.svelte
@@ -17,7 +17,7 @@
 
 {#if $currentPage !== 'configuration' }
     <div class="left mb-20">
-        <button class="btn light tw-w-1/3 tw-justify-center tw-mx-6 tw-relative tw-cursor-pointer" on:click={() => { $currentPage = $currentPage.substring(0, $currentPage.indexOf('/')) }}>&lt; Back</button>
+        <button class="btn light tw-w-1/3 tw-justify-center tw-mx-6 tw-relative tw-cursor-pointer" on:click={() => { $currentPage = $currentPage.substring(0, $currentPage.lastIndexOf('/')) }}>&lt; Back</button>
     </div>
 {/if}
 
@@ -34,7 +34,7 @@
             {/each}
         </section>
         <div class="left mb-20">
-            <button class="btn light tw-w-1/3 tw-justify-center tw-mx-6 tw-relative tw-cursor-pointer" 
+            <button class="btn light tw-w-1/3 tw-justify-center tw-mx-6 tw-relative tw-cursor-pointer"
                 on:click={() => closeCowebsite()}
             >
                 Finish
diff --git a/src/Iframes/Configuration/Components/Sections.svelte b/src/Iframes/Configuration/Components/Sections.svelte
index 1def509..627de94 100644
--- a/src/Iframes/Configuration/Components/Sections.svelte
+++ b/src/Iframes/Configuration/Components/Sections.svelte
@@ -10,14 +10,14 @@
 
 <div class="flex-container">
     {#each layers as layer}
-        <button class="btn light tw-w-1/3 tw-justify-center tw-mx-6 tw-relative tw-cursor-pointer" on:click={() => { $currentPage = layer.name }}>
+        <button class="btn light tw-w-1/3 tw-justify-center tw-mx-6 tw-relative tw-cursor-pointer" on:click={() => { $currentPage = layer.name; }}>
         { new Properties(layer.properties).getString('label') ?? layer.name }
         </button>
     {/each}
 </div>
 
 {#if $currentPage !== 'configuration' }
-    <button class="btn blue-title tw-underline tw-decoration-light-blue tw-cursor-pointe" on:click={() => { $currentPage = $currentPage.substring(0, $currentPage.indexOf('/')) }}>Back</button>
+    <button class="btn blue-title tw-underline tw-decoration-light-blue tw-cursor-pointe" on:click={() => { $currentPage = $currentPage.substring(0, $currentPage.lastIndexOf('/')) }}>Back</button>
 {/if}
 
 <style lang="scss">