diff --git a/main/survey/survey.php b/main/survey/survey.php
index b46d210bb5..dc0354d494 100755
--- a/main/survey/survey.php
+++ b/main/survey/survey.php
@@ -308,7 +308,19 @@ while ($row = Database::fetch_array($result, 'ASSOC')) {
         }
     }
 
-    echo '<tr class="'.$questionsGroupClass.$breakClass.'">';
+    // Highlight the question that was just updated and scrool to it
+    if ($row['question_id']==$my_question_id_survey) {
+        echo '<tr class="'.$questionsGroupClass.$breakClass.'" style="background-color:#A9DFBF;" >';
+        echo '<a name="tocupdatelink" id="tocupdatelink" ></a>';
+        echo '<script>';
+        echo '$(document).ready(function() {';
+        echo "var element_to_scroll_to = document.getElementById('tocupdatelink');";
+        echo 'element_to_scroll_to.scrollIntoView();';
+        echo '});';
+        echo '</script>';
+    } else {
+	    echo '<tr class="'.$questionsGroupClass.$breakClass.'">';
+    }
     echo '	<td>'.$question_counter.'</td>';
     echo '	<td>';