diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index cdb41b9e..6f6e683f 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -69,6 +69,7 @@ module Precious
 
     before do
       @base_url = url('/')
+      settings.wiki_options.merge!({ :base_path => @base_url }) unless settings.wiki_options.has_key? :base_path
     end
 
     get '/' do
diff --git a/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js b/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
index 8dee8aef..2cd547bf 100755
--- a/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
+++ b/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
@@ -269,7 +269,7 @@
       }
 
       // attempt to load the definition for this language
-      var script_uri = '/javascript/editor/langs/' + markup_name + '.js';
+      var script_uri = baseUrl + '/javascript/editor/langs/' + markup_name + '.js';
       $.ajax({
                 url: script_uri,
                 dataType: 'script',