diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
index 357347053bd46fe9718d6f24beb6e20b92354337..54817361f3ea3824a1d821a5b0e11216537ecb12 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
@@ -2,4 +2,4 @@ ApplicationActionBarAdvisor.java 3e7c0fd992586e6ca7724b871eb0b2cf59244028 GREEN
 ApplicationWorkbenchAdvisor.java ef25d5783a4f75e88334fd679834a6e0421f8c2f GREEN
 ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN
 CurrentObjectiveContributionItem.java 59e0a8730d46eb55f365b1df3308aad878ab041c RED
-UpcomingObjectiveContributionItem.java f9ec7ba28ff7473a09767ef94ccf548dd11c2e23 RED
+UpcomingObjectiveContributionItem.java 90ea808681bcf51072de15bf74a63bfefb940d01 RED
diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/UpcomingObjectiveContributionItem.java b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/UpcomingObjectiveContributionItem.java
index f9ec7ba28ff7473a09767ef94ccf548dd11c2e23..90ea808681bcf51072de15bf74a63bfefb940d01 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/UpcomingObjectiveContributionItem.java
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/UpcomingObjectiveContributionItem.java
@@ -37,6 +37,7 @@ import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
@@ -72,6 +73,28 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils;
 public class UpcomingObjectiveContributionItem extends WorkbenchWindowControlContribution
 		implements ISelectionListener, IResourceChangeListener {
 
+	/** Helper to align the upcoming objective combo with the current objective combo. */
+	public class SizedComposite extends Composite {
+		/** Constructor. */
+		public SizedComposite(Composite parent, int style) {
+			super(parent, style);
+		}
+
+		/** {@inheritDoc} */
+		@Override
+		public void setSize(Point size) {
+			super.setSize(computeSize(SWT.DEFAULT, SWT.DEFAULT, true));
+		}
+
+		/** {@inheritDoc} */
+		@Override
+		public void setSize(int width, int height) {
+			Point size = computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+			super.setSize(size.x, size.y);
+		}
+
+	}
+
 	/** The initial upcoming objectives. */
 	private String[] initialSetOfObjectives = {};
 
@@ -108,7 +131,8 @@ public class UpcomingObjectiveContributionItem extends WorkbenchWindowControlCon
 	/** {@inheritDoc} */
 	@Override
 	protected Control createControl(Composite parent) {
-		composite = new Composite(parent, SWT.NONE);
+		// This extra composite is only required here...
+		composite = new SizedComposite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout(3, false);
 		layout.marginWidth = 0;
 		layout.verticalSpacing = 0;