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 89a6ef3..95cc5df 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
@@ -66,6 +66,7 @@ import net.sf.cglib.proxy.Enhancer;
 
 /**
  * Base implementation of {@link DialogPresenter}.
+ * @param <DD> The (sub)type of DialogDefinition this presenter handles.
  */
 public class BaseDialogPresenter<DD extends DialogDefinition> implements DialogPresenter<DD>, ActionListener {
 
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 2465eaf..6968c4c 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
@@ -40,6 +40,7 @@ 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.
+ * @param <DD> The (sub)type of DialogDefinition this presenter handles.
  */
 public interface DialogPresenter<DD extends DialogDefinition> {
 
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 a679747..eedb5ac 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
@@ -46,7 +46,6 @@ import info.magnolia.ui.dialog.DialogCloseHandler;
 import info.magnolia.ui.dialog.DialogView;
 import info.magnolia.ui.dialog.actionarea.DialogActionExecutor;
 import info.magnolia.ui.dialog.definition.ChooseDialogDefinition;
-import info.magnolia.ui.dialog.definition.DialogDefinition;
 import info.magnolia.ui.form.field.factory.FieldFactory;
 import info.magnolia.ui.form.field.factory.FieldFactoryFactory;
 import info.magnolia.ui.vaadin.integration.NullItem;