diff --git a/settings2/common.py b/settings2/common.py
index 3a4003d5cb..319c5f2fc8 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -68,13 +68,15 @@ MAKO_TEMPLATES = {}
 MAKO_TEMPLATES['course'] = [DATA_DIR]
 MAKO_TEMPLATES['sections'] = [DATA_DIR / 'sections']
 MAKO_TEMPLATES['custom_tags'] = [DATA_DIR / 'custom_tags']
-MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates', DATA_DIR / 'info']
+MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates', 
+                          DATA_DIR / 'info',
+                          DATA_DIR / 'problems']
 
 # This is where Django Template lookup is defined. There are a few of these 
 # still left lying around.
 TEMPLATE_DIRS = (
     PROJECT_ROOT / "templates",
-    DATA_DIR / "templates",
+    DATA_DIR / "problems",
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (