diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index c69cede2..ddbaaa64 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -136,7 +136,7 @@ module Precious
           mustache :edit
         end
       else
-        redirect to("/create/#{CGI.escape(@name)}")
+        redirect to("/create/#{encodeURIComponent(@name)}")
       end
     end
 
@@ -354,7 +354,7 @@ module Precious
         file.raw_data
       else
         page_path = [path, name].compact.join('/')
-        redirect to("/create/#{CGI.escape(page_path).gsub('%2F','/')}")
+        redirect to("/create/#{encodeURIComponent(page_path).gsub('%2F','/')}")
       end
     end
 
diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
index 9b35f0f8..279991c3 100644
--- a/lib/gollum/markup.rb
+++ b/lib/gollum/markup.rb
@@ -87,7 +87,7 @@ module Gollum
     def process_headers(doc)
       toc = nil
       doc.css('h1,h2,h3,h4,h5,h6').each do |h|
-        id = CGI::escape(h.content.gsub(' ','-'))
+        id = encodeURIComponent(h.content.gsub(' ','-'))
         level = h.name.gsub(/[hH]/,'').to_i
 
         # Add anchors