diff --git a/static/js/pad2.js b/static/js/pad2.js
index d194b660..6f398bad 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -174,7 +174,7 @@ function handshake()
   function sendClientReady(isReconnect)
   {
     var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
-    padId = unescape(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
+    padId = decodeURIComponent(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
 
     if(!isReconnect)
       document.title = document.title + " | " + padId;
diff --git a/static/timeslider.html b/static/timeslider.html
index c1ea176d..11c5ef7f 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -62,7 +62,7 @@
     
     //get the padId out of the url 
     var urlParts= document.location.pathname.split("/");
-    padId = urlParts[urlParts.length-2];
+    padId = decodeURIComponent(urlParts[urlParts.length-2]);
         
     //set the title
     document.title = document.title + " | " + padId;