diff --git a/guacamole/.gitignore b/guacamole/.gitignore
index c352b3795..1b2666e16 100644
--- a/guacamole/.gitignore
+++ b/guacamole/.gitignore
@@ -1,3 +1,4 @@
 src/main/webapp/META-INF/
+src/main/webapp/generated/
 target/
 *~
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index ff75a224e..e6c736606 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -97,6 +97,27 @@
                 </executions>
             </plugin>
 
+            <!-- Pre-cache Angular templates with maven-angular-plugin -->
+            <plugin>
+                <groupId>com.keithbranton.mojo</groupId>
+                <artifactId>angular-maven-plugin</artifactId>
+                <version>0.3.2</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>html2js</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <sourceDir>${basedir}/src/main/webapp/app/</sourceDir>
+                    <include>**/*.html</include>
+                    <target>${basedir}/src/main/webapp/generated/templates-main/templates.js</target>
+                    <prefix>app</prefix>
+                </configuration>
+            </plugin>
+
             <!-- JS/CSS Minification Plugin -->
             <plugin>
                 <groupId>com.samaxes.maven</groupId>
@@ -146,6 +167,7 @@
 
                             <jsSourceIncludes>
                                 <jsSourceInclude>app/**/*.js</jsSourceInclude>
+                                <jsSourceInclude>generated/**/*.js</jsSourceInclude>
                             </jsSourceIncludes>
 
                             <!-- Do not minify and include tests -->
diff --git a/guacamole/src/main/webapp/app/index/indexModule.js b/guacamole/src/main/webapp/app/index/indexModule.js
index 99fb457fa..8d30eaa9e 100644
--- a/guacamole/src/main/webapp/app/index/indexModule.js
+++ b/guacamole/src/main/webapp/app/index/indexModule.js
@@ -35,5 +35,6 @@ angular.module('index', [
     'notification',
     'pascalprecht.translate',
     'rest',
-    'settings'
+    'settings',
+    'templates-main'
 ]);