diff --git a/course/dndupload.js b/course/dndupload.js
index 0fcb900eff6..783a37bcfc9 100644
--- a/course/dndupload.js
+++ b/course/dndupload.js
@@ -565,7 +565,7 @@ M.course_dndupload = {
         resel.progressouter.appendChild(resel.progress);
         resel.div.appendChild(resel.progressouter);
 
-        modsel.insertBefore(resel.li, modsel.get('children').pop()); // Leave the 'preview element' at the bottom
+        modsel.insertBefore(resel.li, modsel.get('children')); // Leave the 'preview element' at the bottom
 
         return resel;
     },
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index f65d4779984..0de7b9818e4 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -1123,6 +1123,10 @@ tr.flagged-tag a {
     padding-top: 20px;
 }
 
+.activity.label.modtype_label .mod-indent {
+    float: none;
+}
+
 @include media-breakpoint-up(sm) {
     $mod-indent-size: 30px;
     /* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 54578ef8e03..10653f4099f 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10776,6 +10776,9 @@ tr.flagged-tag a {
   float: left;
   padding-top: 20px; }
 
+.activity.label.modtype_label .mod-indent {
+  float: none; }
+
 @media (min-width: 576px) {
   /* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
   .mod-indent-1 {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index e8f7ab505dc..0c89b4c0562 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -10776,6 +10776,9 @@ tr.flagged-tag a {
   float: left;
   padding-top: 20px; }
 
+.activity.label.modtype_label .mod-indent {
+  float: none; }
+
 @media (min-width: 576px) {
   /* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
   .mod-indent-1 {