diff --git a/finder/admin/file.py b/finder/admin/file.py
index da2dafc8b..0475eeff7 100644
--- a/finder/admin/file.py
+++ b/finder/admin/file.py
@@ -39,7 +39,7 @@ class Meta:
 @admin.register(FileModel)
 class FileAdmin(InodeAdmin):
     form = FileModelForm
-    form_template = 'admin/finder/change_file_form.html'
+    form_template = 'finder/admin/change_file_form.html'
     readonly_fields = ['details', 'owner', 'created_at', 'last_modified_at', 'mime_type', 'sha1']
 
     @property
diff --git a/finder/admin/folder.py b/finder/admin/folder.py
index fbca83dd3..40a23e3d0 100644
--- a/finder/admin/folder.py
+++ b/finder/admin/folder.py
@@ -21,7 +21,7 @@
 
 @admin.register(FolderModel)
 class FolderAdmin(InodeAdmin):
-    form_template = 'admin/finder/change_folder_form.html'
+    form_template = 'finder/admin/change_folder_form.html'
     _model_admin_cache = {}
     _legends = {
         'name': _("Name"),
diff --git a/finder/templates/admin/finder/base_site.html b/finder/templates/finder/admin/base_site.html
similarity index 100%
rename from finder/templates/admin/finder/base_site.html
rename to finder/templates/finder/admin/base_site.html
diff --git a/finder/templates/admin/finder/change_file_form.html b/finder/templates/finder/admin/change_file_form.html
similarity index 100%
rename from finder/templates/admin/finder/change_file_form.html
rename to finder/templates/finder/admin/change_file_form.html
diff --git a/finder/templates/admin/finder/change_folder_form.html b/finder/templates/finder/admin/change_folder_form.html
similarity index 100%
rename from finder/templates/admin/finder/change_folder_form.html
rename to finder/templates/finder/admin/change_folder_form.html