diff --git a/src/webapp/components/views/AnswerView.vue b/src/webapp/components/views/AnswerView.vue
index 0bd2ab4..a460c0f 100644
--- a/src/webapp/components/views/AnswerView.vue
+++ b/src/webapp/components/views/AnswerView.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, ref, watch, nextTick } from "vue";
 
 import { useGameCreationStore } from "@/stores/GameCreationStore";
 import { useRoute } from "vue-router";
@@ -34,7 +34,18 @@ onMounted( () => {
   if( imageRef.value ){
     imageRef.value.src = API_URL + '/game/file/' + props.answer.filename;
   }
-})
+});
+
+watch(
+  () => props.bEIndex,
+  ( _newVal, _oldVal ) => {
+    nextTick( () => {
+        if( imageRef.value ){
+            imageRef.value.src = API_URL + '/game/file/' + props.answer.filename;
+        }
+    });
+  }
+)
 
 </script>
 
diff --git a/src/webapp/components/views/BoardEntryEditView.vue b/src/webapp/components/views/BoardEntryEditView.vue
index f81bfc4..4e20591 100644
--- a/src/webapp/components/views/BoardEntryEditView.vue
+++ b/src/webapp/components/views/BoardEntryEditView.vue
@@ -92,8 +92,12 @@ watch(
 watch(
   () => props.boardEntryIndex,
   ( newVal, oldVal ) => {
-    answerImageInput.value.value = "";
-    questionImageInput.value.value = "";
+    if( answerImageInput.value ){
+      answerImageInput.value.value = "";
+    }
+    if( questionImageInput.value ){
+      questionImageInput.value.value = "";
+    }
   }
 );
 
diff --git a/src/webapp/components/views/BoardEntryView.vue b/src/webapp/components/views/BoardEntryView.vue
index 521f47d..327fb43 100644
--- a/src/webapp/components/views/BoardEntryView.vue
+++ b/src/webapp/components/views/BoardEntryView.vue
@@ -91,6 +91,8 @@ function stopAudio(){
     <div v-show="props.isAnswerRevealed">
       <AnswerView
         :answer="boardEntry.answer"
+        :cIndex="props.cIndex"
+        :bEIndex="props.bEIndex"
       />
     </div>