diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index 83ce9d18..40631fce 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -449,7 +449,7 @@ module Precious
         @content  = page.formatted_data
         @upload_dest = settings.wiki_options[:allow_uploads] ?
                          (settings.wiki_options[:per_page_uploads] ?
-                            @name : 'uploads'
+                            "#{path}/#{@name}".sub(/^\/\//, '') : 'uploads'
                          ) : ''
 
         # Extensions and layout data
diff --git a/lib/gollum/public/gollum/javascript/gollum.js b/lib/gollum/public/gollum/javascript/gollum.js
index f9ac94ce..5fc447d3 100755
--- a/lib/gollum/public/gollum/javascript/gollum.js
+++ b/lib/gollum/public/gollum/javascript/gollum.js
@@ -155,7 +155,7 @@ $(document).ready(function() {
         fields: [
           {
             type:   'file',
-            context: 'Your uploaded file will be accessible at /'+uploadDest+'/[filename]',
+            context: 'Your uploaded file will be accessible at<br>/'+uploadDest+'/[filename]',
             action: baseUrl + '/uploadFile'
           }
         ],