diff --git a/src/collective/documentgenerator/browser/configure.zcml b/src/collective/documentgenerator/browser/configure.zcml
index ba5eaa68..120607c5 100644
--- a/src/collective/documentgenerator/browser/configure.zcml
+++ b/src/collective/documentgenerator/browser/configure.zcml
@@ -191,7 +191,7 @@
           name="documentviewer"
           for="collective.documentgenerator.content.pod_template.IConfigurablePODTemplate"
           class="collective.documentgenerator.browser.overrides.DGDXDocumentViewerView"
-          template="templates/documentviewerdx.pt"
+          template="browser/templates/documentviewerdx.pt"
           permission="zope2.View"
           layer=".interfaces.ILayer" />
     </configure>
diff --git a/src/collective/documentgenerator/browser/overrides.py b/src/collective/documentgenerator/browser/overrides.py
index 320796f8..fcf35117 100644
--- a/src/collective/documentgenerator/browser/overrides.py
+++ b/src/collective/documentgenerator/browser/overrides.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from collective.documentgenerator.browser.views import ViewConfigurablePodTemplate
-from collective.documentviewer.views import DXDocumentViewerView
+from collective.documentviewer.browser.views import DXDocumentViewerView
 
 
 class DGDXDocumentViewerView(ViewConfigurablePodTemplate, DXDocumentViewerView):