diff --git a/core/js/js.js b/core/js/js.js
index bf33e3f2e48e5820f6eba74c5ba902065b43e3d3..89682e3013f4fa7ebcee40df3957c13586899cfc 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -260,7 +260,7 @@ var OC={
 	filePath:function(app,type,file){
 		var isCore=OC.coreApps.indexOf(app)!==-1,
 			link=OC.webroot;
-		if((file.substring(file.length-3) === 'php' || file.substring(file.length-3) === 'css') && !isCore){
+		if(file.substring(file.length-3) === 'php' && !isCore){
 			link+='/index.php/apps/' + app;
 			if (file != 'index.php') {
 				link+='/';
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 3af56c490e65e455196d2e133dce699970ec4f37..c61528f66863732be4dbb186af0fd1bc19d9fa5d 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -134,6 +134,26 @@ describe('Core base tests', function() {
 			expect(escapeHTML('This is a good string without HTML.')).toEqual('This is a good string without HTML.');
 		});
 	});
+	describe('filePath', function() {
+		beforeEach(function() {
+			OC.webroot = 'http://localhost';
+			OC.appswebroots['files'] = OC.webroot + '/apps3/files';
+		});
+		afterEach(function() {
+			delete OC.appswebroots['files'];
+		});
+
+		it('Uses a direct link for css and images,' , function() {
+			expect(OC.filePath('core', 'css', 'style.css')).toEqual('http://localhost/core/css/style.css');
+			expect(OC.filePath('files', 'css', 'style.css')).toEqual('http://localhost/apps3/files/css/style.css');
+			expect(OC.filePath('core', 'img', 'image.png')).toEqual('http://localhost/core/img/image.png');
+			expect(OC.filePath('files', 'img', 'image.png')).toEqual('http://localhost/apps3/files/img/image.png');
+		});
+		it('Routes PHP files via index.php,' , function() {
+			expect(OC.filePath('core', 'ajax', 'test.php')).toEqual('http://localhost/index.php/core/ajax/test.php');
+			expect(OC.filePath('files', 'ajax', 'test.php')).toEqual('http://localhost/index.php/apps/files/ajax/test.php');
+		});
+	});
 	describe('Link functions', function() {
 		var TESTAPP = 'testapp';
 		var TESTAPP_ROOT = OC.webroot + '/appsx/testapp';