diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index 9c790e3fe42..96f4c90c6dd 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -14,7 +14,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
     if (!url) return url;
 
     // if it's a non relative URL, return it.
-    if (!/^\/[^\/]/.test(url)) return url;
+    if (url !== '/' && !/^\/[^\/]/.test(url)) return url;
 
     var u = Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri;
 
diff --git a/test/javascripts/lib/discourse-test.js.es6 b/test/javascripts/lib/discourse-test.js.es6
new file mode 100644
index 00000000000..8f3725fa442
--- /dev/null
+++ b/test/javascripts/lib/discourse-test.js.es6
@@ -0,0 +1,7 @@
+module("lib:discourse");
+
+test("getURL on subfolder install", function() {
+  Discourse.BaseUri = "/forum";
+  equal(Discourse.getURL("/"), "/forum/", "root url has subfolder");
+  equal(Discourse.getURL("/users/neil"), "/forum/users/neil", "relative url has subfolder");
+});
\ No newline at end of file