diff --git a/red/api/theme.js b/red/api/theme.js
index 7f3e0f36d..b2f5a7c3f 100644
--- a/red/api/theme.js
+++ b/red/api/theme.js
@@ -98,11 +98,11 @@ module.exports = {
         if (theme.page) {
 
             themeContext.page.css = serveFilesFromTheme(
-                themeContext.page.css,
+                theme.page.css,
                 themeApp,
                 "/css/")
             themeContext.page.scripts = serveFilesFromTheme(
-                themeContext.page.scripts,
+                theme.page.scripts,
                 themeApp,
                 "/scripts/")
 
diff --git a/test/red/api/theme_spec.js b/test/red/api/theme_spec.js
index 56e735c34..9a963935d 100644
--- a/test/red/api/theme_spec.js
+++ b/test/red/api/theme_spec.js
@@ -55,7 +55,7 @@ describe("theme handler", function() {
                 page: {
                     title: "Test Page Title",
                     favicon: "/absolute/path/to/theme/icon",
-                    css: "/absolute/path/to/custom/css/file",
+                    css: "/absolute/path/to/custom/css/file.css",
                     scripts: "/absolute/path/to/script.js"
                 },
                 header: {
@@ -92,14 +92,19 @@ describe("theme handler", function() {
         }});
 
         theme.app();
-        
+
         var context = theme.context();
         context.should.have.a.property("page");
         context.page.should.have.a.property("title","Test Page Title");
         context.should.have.a.property("header");
         context.header.should.have.a.property("title","Test Header Title");
         context.page.should.have.a.property("css");
+        context.page.css.should.have.lengthOf(1);
+        context.page.css[0].should.eql('theme/css/file.css');
+
         context.page.should.have.a.property("scripts");
+        context.page.scripts.should.have.lengthOf(1);
+        context.page.scripts[0].should.eql('theme/scripts/script.js');
 
         var settings = theme.settings();
         settings.should.have.a.property("deployButton");