diff --git a/main/exercise/admin.php b/main/exercise/admin.php
index 2b2476fe9a..75af2a9171 100755
--- a/main/exercise/admin.php
+++ b/main/exercise/admin.php
@@ -281,7 +281,7 @@ if (api_is_in_gradebook()) {
     ];
 }
 
-$interbreadcrumb[] = ["url" => "exercise.php?".api_get_cidreq(), 'name' => get_lang('Exercises')];
+$interbreadcrumb[] = ['url' => 'exercise.php?'.api_get_cidreq(), 'name' => get_lang('Exercises')];
 if (isset($_GET['newQuestion']) || isset($_GET['editQuestion'])) {
     $interbreadcrumb[] = [
         "url" => "admin.php?exerciseId=".$objExercise->id.'&'.api_get_cidreq(),
diff --git a/main/exercise/question_admin.inc.php b/main/exercise/question_admin.inc.php
index 1f236b2c14..6293b7d7a6 100755
--- a/main/exercise/question_admin.inc.php
+++ b/main/exercise/question_admin.inc.php
@@ -68,7 +68,12 @@ if (is_object($objQuestion)) {
                 echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemUpdated"</script>';
             } else {
                 // New question
-                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemAdded"</script>';
+                $page = '';
+                $length = api_get_configuration_value('question_pagination_length');
+                if ($length) {
+                    $page = round($objExercise->get_count_question_list() / $length);
+                }
+                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&page='.$page.'&message=ItemAdded"</script>';
             }
         } else {
             echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&hotspotadmin='.$objQuestion->id.'&'.api_get_cidreq().'"</script>';
diff --git a/main/exercise/question_list_admin.inc.php b/main/exercise/question_list_admin.inc.php
index 934a8dfe16..e433bebd99 100755
--- a/main/exercise/question_list_admin.inc.php
+++ b/main/exercise/question_list_admin.inc.php
@@ -300,6 +300,7 @@ if (!$inATest) {
                     $move = Display::returnFontAwesomeIcon('arrows moved', 1, true);
                 }
 
+
                 // Question name
                 $questionName =
                     '<a href="#" title = "'.Security::remove_XSS($title).'">
@@ -328,8 +329,7 @@ if (!$inATest) {
                 // Question score
                 $questionScore = $objQuestionTmp->selectWeighting();
 
-                echo '
-                    <div id="question_id_list_'.$id.'">
+                echo '<div id="question_id_list_'.$id.'">
                         <div class="header_operations" data-exercise="'.$objExercise->selectId().'"
                             data-question="'.$id.'">
                             <div class="row">
diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php
index 59021acbc5..4acf20938d 100755
--- a/main/inc/ajax/exercise.ajax.php
+++ b/main/inc/ajax/exercise.ajax.php
@@ -730,7 +730,11 @@ switch ($action) {
         $objExercise = new Exercise();
         $objExercise->read($exerciseId);
         $objQuestion = Question::read($questionId);
-
+        $id = '';
+        if (api_get_configuration_value('show_question_id')) {
+            $id = '<h4>#'.$objQuestion->iid.'</h4>';
+        }
+        echo $id;
         echo '<p class="lead">'.$objQuestion->get_question_type_name().'</p>';
         if ($objQuestion->type === FILL_IN_BLANKS) {
             echo '<script>