diff --git a/_assets/src/components/Listing.vue b/_assets/src/components/Listing.vue
index 8b7e3059..8b08a6cb 100644
--- a/_assets/src/components/Listing.vue
+++ b/_assets/src/components/Listing.vue
@@ -85,7 +85,7 @@ export default {
   },
   methods: {
     base64: function (name) {
-      return window.btoa(name)
+      return window.btoa(unescape(encodeURIComponent(name)))
     },
     dragEnter: function (event) {
       let items = document.getElementsByClassName('item')
diff --git a/_assets/src/components/ListingItem.vue b/_assets/src/components/ListingItem.vue
index 64ded53d..d8efc13a 100644
--- a/_assets/src/components/ListingItem.vue
+++ b/_assets/src/components/ListingItem.vue
@@ -6,8 +6,7 @@
   @drop="drop"
   @click="click"
   @dblclick="open"
-  :aria-selected="isSelected()"
-  :id="base64()">
+  :aria-selected="isSelected()">
     <div>
       <i class="material-icons">{{ icon() }}</i>
     </div>
@@ -57,9 +56,6 @@ export default {
     humanTime: function () {
       return moment(this.modified).fromNow()
     },
-    base64: function () {
-      return window.btoa(this.name)
-    },
     dragStart: function (event) {
       if (this.selectedCount === 0) {
         this.addSelected(this.index)
diff --git a/_assets/src/components/RenamePrompt.vue b/_assets/src/components/RenamePrompt.vue
index b46c1e16..6999d669 100644
--- a/_assets/src/components/RenamePrompt.vue
+++ b/_assets/src/components/RenamePrompt.vue
@@ -49,6 +49,7 @@ export default {
         oldLink = this.req.data.items[this.selected[0]].url
       }
 
+      this.name = encodeURIComponent(this.name)
       newLink = page.removeLastDir(oldLink) + '/' + this.name
 
       // buttons.setLoading('rename')