diff --git a/web/src/main/java/org/openmrs/web/controller/PseudoStaticContentController.java b/web/src/main/java/org/openmrs/web/controller/PseudoStaticContentController.java
index 166a9edadf34..8c3d6da8d210 100644
--- a/web/src/main/java/org/openmrs/web/controller/PseudoStaticContentController.java
+++ b/web/src/main/java/org/openmrs/web/controller/PseudoStaticContentController.java
@@ -70,7 +70,11 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons
 		if (interpretJstl) {
 			path += ".withjstl";
 		}
-		
+
+		if (path.startsWith("/")) {
+			path = path.substring(1);
+		}
+
 		return new ModelAndView(path);
 	}
 	
diff --git a/webapp/src/main/webapp/WEB-INF/openmrs_static_content-servlet.xml b/webapp/src/main/webapp/WEB-INF/openmrs_static_content-servlet.xml
index 1f453580f5ab..29065d7c4a3a 100644
--- a/webapp/src/main/webapp/WEB-INF/openmrs_static_content-servlet.xml
+++ b/webapp/src/main/webapp/WEB-INF/openmrs_static_content-servlet.xml
@@ -25,6 +25,7 @@
 	</bean>
 
 	<bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+		<property name="order" value="50"/>
 		<property name="mappings">
 			<props>
 				<prop key="/**">staticResourceDispatcher</prop>