diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js
index 777bd935..7331b22c 100755
--- a/server/public/assets/js/frontpage.js
+++ b/server/public/assets/js/frontpage.js
@@ -151,7 +151,7 @@ var Frontpage = {
             data: data,
             limit: 5, // The max amount of results that can be shown at once. Default: Infinity.
             onAutocomplete: function(val) {
-                Frontpage.to_channel(val, false);
+                Frontpage.to_channel(Helper.encodeChannelName(val), false);
             },
         });
 
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 802aac4e..18e21531 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -894,13 +894,13 @@ function addDynamicListeners() {
     addListener("click", ".listen-button", function(event){
         if(document.querySelector(".room-namer").value === ""){
             this.preventDefault();
-            Frontpage.to_channel(document.querySelector(".room-namer").getAttribute("placeholder"));
+            Frontpage.to_channel(Helper.encodeChannelName(document.querySelector(".room-namer").getAttribute("placeholder")));
         }
     });
 
     addListener("submit", ".channel-finder", function(event){
         this.preventDefault();
-        Frontpage.to_channel(document.querySelector(".room-namer").value);
+        Frontpage.to_channel(Helper.encodeChannelName(document.querySelector(".room-namer").value));
         return false;
     });