diff --git a/index.php b/index.php
index c17e016c..6d8d9c23 100755
--- a/index.php
+++ b/index.php
@@ -18,7 +18,7 @@
 		<div id="change" class="small">
 			<div id="mobile-banner"></div>
 			<a id="toptitle" href="/">Zöff</a>
-			<div id="chan" class="chan" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></div>
+			<div id="chan" class="chan" title="Show big URL" onclick="show()"><?php echo(ucfirst(urldecode($list)));?></div>
 			<input id="search" name="v" title="Search for songs..." type="text" class="search_input innbox" spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off"/>
 			<div id="results"></div>
 			<div class="main">
diff --git a/js/list.js b/js/list.js
index 264abdbf..62f7be0b 100755
--- a/js/list.js
+++ b/js/list.js
@@ -150,7 +150,7 @@ function show(){
     	showToggle=false;
     	$("#toptitle").empty();
         $("#chan").addClass("bigChan");
-        $("#chan").html("zoff.no/"+chan);
+        $("#chan").html("zoff.no/"+encodeURI(chan));
     }else{
     	showToggle=true;
     	$("#toptitle").html("Zöff");