diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 4569b07bab..7abaf0fe69 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -1025,7 +1025,8 @@ class AnnotationInput(InputTypeBase):
 
         return {
             'options_value': options_value,
-            'comment_value': comment_value
+            'has_options_value': len(options_value) > 0, # for convenience
+            'comment_value': comment_value,
         }
 
     def _extra_context(self):
diff --git a/common/lib/capa/capa/templates/annotationinput.html b/common/lib/capa/capa/templates/annotationinput.html
index bfbce08a0f..e0172bb13b 100644
--- a/common/lib/capa/capa/templates/annotationinput.html
+++ b/common/lib/capa/capa/templates/annotationinput.html
@@ -20,12 +20,14 @@
     <ul class="tags">
     % for option in options:
         <li>
-            % if all([c == 'correct' for c in option['choice'], status]):
-            <span class="tag-status correct" id="status_${id}"></span>
-            % elif all([c == 'partially-correct' for c in option['choice'], status]):
-            <span class="tag-status partially-correct" id="status_${id}"></span>
-            % elif all([c == 'incorrect' for c in option['choice'], status]):
-            <span class="tag-status incorrect" id="status_${id}"></span>
+            % if has_options_value:
+                % if all([c == 'correct' for c in option['choice'], status]):
+                <span class="tag-status correct" id="status_${id}"></span>
+                % elif all([c == 'partially-correct' for c in option['choice'], status]):
+                <span class="tag-status partially-correct" id="status_${id}"></span>
+                % elif all([c == 'incorrect' for c in option['choice'], status]):
+                <span class="tag-status incorrect" id="status_${id}"></span>
+                % endif
             % endif
 
             <span class="tag
@@ -50,14 +52,15 @@
         <input type="hidden" class="value" name="input_${id}" id="input_${id}" value="${value|h}" />
     % endif
 
-    <p id="answer_${id}" class="answer answer-annotation"></p>
-
     % if status == 'unsubmitted':
     <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
     % elif status == 'incomplete':
     <span class="incorrect" id="status_${id}"></span>
+    % elif status == 'incorrect' and not has_options_value:
+    <span class="incorrect" id="status_${id}"></span>
     % endif
 
+    <p id="answer_${id}" class="answer answer-annotation"></p>
 </div>
 </form>