diff --git a/magnolia-ui-contentapp/src/main/java/info/magnolia/ui/contentapp/movedialog/MoveDialogPresenterImpl.java b/magnolia-ui-contentapp/src/main/java/info/magnolia/ui/contentapp/movedialog/MoveDialogPresenterImpl.java
index a448705..92b0ec3 100644
--- a/magnolia-ui-contentapp/src/main/java/info/magnolia/ui/contentapp/movedialog/MoveDialogPresenterImpl.java
+++ b/magnolia-ui-contentapp/src/main/java/info/magnolia/ui/contentapp/movedialog/MoveDialogPresenterImpl.java
@@ -90,7 +90,7 @@ import com.vaadin.data.Property.ValueChangeListener;
 /**
  * Implementation of {@link MoveDialogPresenter}.
  */
-public class MoveDialogPresenterImpl extends BaseDialogPresenter implements MoveDialogPresenter {
+public class MoveDialogPresenterImpl extends BaseDialogPresenter<DialogDefinition> implements MoveDialogPresenter {
 
     private DialogView dialogView;
 
diff --git a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/BaseDialogPresenter.java b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/BaseDialogPresenter.java
index 1852da0..02ddf7d 100644
--- a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/BaseDialogPresenter.java
+++ b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/BaseDialogPresenter.java
@@ -67,7 +67,7 @@ import net.sf.cglib.proxy.Enhancer;
 /**
  * Base implementation of {@link DialogPresenter}.
  */
-public class BaseDialogPresenter implements DialogPresenter, ActionListener {
+public class BaseDialogPresenter<DD extends DialogDefinition> implements DialogPresenter<DD>, ActionListener {
 
     private Logger log = LoggerFactory.getLogger(getClass());
 
@@ -85,7 +85,7 @@ public class BaseDialogPresenter implements DialogPresenter, ActionListener {
 
     private UiContext uiContext;
 
-    private DialogDefinition definition;
+    private DD definition;
 
     @Inject
     public BaseDialogPresenter(ComponentProvider componentProvider, ActionExecutor executor, DialogView view, I18nizer i18nizer, SimpleTranslator i18n) {
@@ -122,7 +122,7 @@ public class BaseDialogPresenter implements DialogPresenter, ActionListener {
     }
 
     @Override
-    public DialogView start(DialogDefinition definition, UiContext uiContext) {
+    public DialogView start(DD definition, UiContext uiContext) {
         this.uiContext = uiContext;
         // ChooseDialogDefinition is already enhanced as it is obtained via ContentAppDescriptor.getChooseDialog() at ContentApp.openChooseDialog(..)
         if (Enhancer.isEnhanced(definition.getClass())) {
@@ -191,7 +191,7 @@ public class BaseDialogPresenter implements DialogPresenter, ActionListener {
         }
     }
 
-    protected DialogDefinition getDefinition() {
+    protected DD getDefinition() {
         return definition;
     }
 
diff --git a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/DialogPresenter.java b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/DialogPresenter.java
index be32708..2465eaf 100644
--- a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/DialogPresenter.java
+++ b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/DialogPresenter.java
@@ -41,9 +41,9 @@ import info.magnolia.ui.dialog.definition.DialogDefinition;
  * {@link DialogPresenter} takes care of {@link DialogView} presentation, the main responsibility
  * of it is to take care of dialog actions/events.
  */
-public interface DialogPresenter {
+public interface DialogPresenter<DD extends DialogDefinition> {
 
-    DialogView start(DialogDefinition definition, UiContext uiContext);
+    DialogView start(DD definition, UiContext uiContext);
 
     DialogView getView();
 
diff --git a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/choosedialog/ChooseDialogPresenter.java b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/choosedialog/ChooseDialogPresenter.java
index 17cf54f..ed06098 100644
--- a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/choosedialog/ChooseDialogPresenter.java
+++ b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/choosedialog/ChooseDialogPresenter.java
@@ -41,7 +41,7 @@ import info.magnolia.ui.dialog.definition.ChooseDialogDefinition;
 /**
  * Dialog presenter for a dialog that allows for choosing an item.
  */
-public interface ChooseDialogPresenter extends DialogPresenter {
+public interface ChooseDialogPresenter extends DialogPresenter<ChooseDialogDefinition> {
 
     ChooseDialogView start(ChooseDialogCallback callback, ChooseDialogDefinition definition, UiContext uiContext, String itemId);
 
diff --git a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/choosedialog/ChooseDialogPresenterImpl.java b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/choosedialog/ChooseDialogPresenterImpl.java
index 7d8a421..a679747 100644
--- a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/choosedialog/ChooseDialogPresenterImpl.java
+++ b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/choosedialog/ChooseDialogPresenterImpl.java
@@ -67,7 +67,7 @@ import com.vaadin.ui.Field;
 /**
  * Factory for creating workbench choose dialog presenters.
  */
-public class ChooseDialogPresenterImpl extends BaseDialogPresenter implements ChooseDialogPresenter {
+public class ChooseDialogPresenterImpl extends BaseDialogPresenter<ChooseDialogDefinition> implements ChooseDialogPresenter {
 
     private static final Logger log = LoggerFactory.getLogger(ChooseDialogPresenterImpl.class);
 
@@ -97,7 +97,7 @@ public class ChooseDialogPresenterImpl extends BaseDialogPresenter implements Ch
     }
 
     @Override
-    public ChooseDialogView start(DialogDefinition definition, UiContext uiContext) {
+    public ChooseDialogView start(ChooseDialogDefinition definition, UiContext uiContext) {
         getExecutor().setDialogDefinition(definition);
         return (ChooseDialogView)super.start(definition, uiContext);
     }
diff --git a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/formdialog/FormDialogPresenter.java b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/formdialog/FormDialogPresenter.java
index 5406189..85cd6e8 100644
--- a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/formdialog/FormDialogPresenter.java
+++ b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/formdialog/FormDialogPresenter.java
@@ -44,7 +44,7 @@ import com.vaadin.data.Item;
 /**
  * Interface for {@link FormDialogPresenterImpl}.
  */
-public interface FormDialogPresenter extends DialogPresenter {
+public interface FormDialogPresenter extends DialogPresenter<FormDialogDefinition> {
 
     @Override
     FormView getView();
diff --git a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/formdialog/FormDialogPresenterImpl.java b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/formdialog/FormDialogPresenterImpl.java
index 257bece..d8d3115 100644
--- a/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/formdialog/FormDialogPresenterImpl.java
+++ b/magnolia-ui-dialog/src/main/java/info/magnolia/ui/dialog/formdialog/FormDialogPresenterImpl.java
@@ -63,7 +63,7 @@ import com.vaadin.data.Item;
 /**
  * Presenter for forms opened inside dialogs.
  */
-public class FormDialogPresenterImpl extends BaseDialogPresenter implements FormDialogPresenter, EditorValidator {
+public class FormDialogPresenterImpl extends BaseDialogPresenter<FormDialogDefinition> implements FormDialogPresenter, EditorValidator {
 
     private EditorCallback callback;