diff --git a/netbox/extras/ui/panels.py b/netbox/extras/ui/panels.py
index 4cad3c76c..2ab55ecd8 100644
--- a/netbox/extras/ui/panels.py
+++ b/netbox/extras/ui/panels.py
@@ -15,7 +15,7 @@ class CustomFieldsPanel(panels.ObjectPanel):
     """
     Render a panel showing the value of all custom fields defined on the object.
     """
-    template_name = 'ui/panels/custom_fields.html'
+    template_name = 'extras/panels/custom_fields.html'
     title = _('Custom Fields')
 
     def get_context(self, context):
@@ -57,7 +57,7 @@ class TagsPanel(panels.ObjectPanel):
     """
     Render a panel showing the tags assigned to the object.
     """
-    template_name = 'ui/panels/tags.html'
+    template_name = 'extras/panels/tags.html'
     title = _('Tags')
 
     def get_context(self, context):
diff --git a/netbox/templates/ui/panels/custom_fields.html b/netbox/templates/extras/panels/custom_fields.html
similarity index 100%
rename from netbox/templates/ui/panels/custom_fields.html
rename to netbox/templates/extras/panels/custom_fields.html
diff --git a/netbox/templates/ui/panels/tags.html b/netbox/templates/extras/panels/tags.html
similarity index 100%
rename from netbox/templates/ui/panels/tags.html
rename to netbox/templates/extras/panels/tags.html