diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
index 6903af7740d23ce32bb1b4980a4279fd76fd9120..220632fe46b46bd940344919ccc7459b7ad3208b 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
@@ -1,2 +1,2 @@
 ColumnHandle.java 8fc5f04cbb0127e5df8c7a9e3b2620502bf93716 GREEN
-GenericAnnotationView.java 3986c6ab6f1b5f9ec04780c3d6256e7c70b91c1d GREEN
+GenericAnnotationView.java 494cbcade7fd5d66b9629b86549eb25d4d4c93dd YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
index 3986c6ab6f1b5f9ec04780c3d6256e7c70b91c1d..494cbcade7fd5d66b9629b86549eb25d4d4c93dd 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
@@ -220,11 +220,6 @@ public class GenericAnnotationView extends AnnotationViewPartBase {
 			// Minimize flickering while updating the table
 			tableViewer.getTable().setRedraw(false);
 
-			// Input must be set before the construction of the columns, since the editing support
-			// for a given cell might need to query the contents of other model elements (e.g., in
-			// order to aggregate a set of admissible choices for its value).
-			tableViewer.setInput(annotationEntries);
-
 			// Sorted set of {@link ColumnHandle} used to instantiate this {@link
 			// GenericAnnotationView}'s columns in the right order.
 			Set<ColumnHandle<?>> sortedColumnHandles = new TreeSet<ColumnHandle<?>>();
@@ -236,6 +231,11 @@ public class GenericAnnotationView extends AnnotationViewPartBase {
 				column.dispose();
 			}
 
+			// Input must be set before the construction of the columns, since the editing support
+			// for a given cell might need to query the contents of other model elements (e.g., in
+			// order to aggregate a set of admissible choices for its value).
+			tableViewer.setInput(annotationEntries);
+
 			// Aggregate required columns. Column order is defined by ColumnHandle.compareTo().
 			for(AnnotationEntry entry : annotationEntries) {
 				for(IAnnotatedSpecification spec : entry.getSpecificationsList()) {