diff --git a/horizon/conf/panel_template/panel.py b/horizon/conf/panel_template/panel.py
index 3c1d85a9f..4364438e2 100644
--- a/horizon/conf/panel_template/panel.py
+++ b/horizon/conf/panel_template/panel.py
@@ -10,4 +10,4 @@ class {{ panel_name|title }}(horizon.Panel):
     slug = "{{ panel_name|slugify }}"
 
 
-dashboard.register({{ panel_name|title }})
+dashboard.{{ dash_name|title }}.register({{ panel_name|title }})
diff --git a/horizon/conf/panel_template/views.py b/horizon/conf/panel_template/views.py
index 78cd9d30c..a5116ca48 100644
--- a/horizon/conf/panel_template/views.py
+++ b/horizon/conf/panel_template/views.py
@@ -3,7 +3,7 @@ from horizon import views
 
 class IndexView(views.APIView):
     # A very simple class-based view...
-    template_name = '{{ panel_name }}/index.html'
+    template_name = '{{ dash_name }}/{{ panel_name }}/index.html'
 
     def get_data(self, request, context, *args, **kwargs):
         # Add data to the context here...