diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
index e2d7660..e128da4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
@@ -54,6 +54,7 @@
 				NotesAction notesAction = new NotesAction();
 				notesAction.setEnabled(needsNotes());
 				toolBarManager.add(notesAction);
+				toolBarManager.add(getMaximizePartAction());
 			}
 		};
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
index 42b0f6d..ab707b2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
@@ -238,6 +238,9 @@
 			}
 			gd.heightHint = heightHint;
 			gd.minimumHeight = heightHint;
+			if (gd.widthHint == -1) {
+				gd.widthHint = 300;// needs to be set or else heightHint is ignored
+			}
 
 			getTaskEditorPage().reflow();
 			CommonFormUtil.ensureVisible(control);