diff --git a/src/web/app/components/session-edit-form/session-edit-form.component.html b/src/web/app/components/session-edit-form/session-edit-form.component.html
index d6695e067a2..27aabc5873d 100644
--- a/src/web/app/components/session-edit-form/session-edit-form.component.html
+++ b/src/web/app/components/session-edit-form/session-edit-form.component.html
@@ -177,8 +177,8 @@ <h5>Or</h5>
           </div>
           <div class="col-md-4 border-left-gray">
             <div class="row text-center">
-              <div class="ngb-tooltip-class col-12 text-md-start ms-md-2" ngbTooltip="Amount of time the system will continue accepting submissions after the specified deadline.">
-                <label for="grace-period" class="control-label font-bold">
+              <div class="col-12 text-md-start ms-md-2">
+                <label for="grace-period" class="ngb-tooltip-class control-label font-bold" ngbTooltip="Amount of time the system will continue accepting submissions after the specified deadline.">
                   Grace period
                 </label>
               </div>
diff --git a/src/web/app/pages-instructor/instructor-session-edit-page/__snapshots__/instructor-session-edit-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-session-edit-page/__snapshots__/instructor-session-edit-page.component.spec.ts.snap
index f62a3acfc6f..466a56f7d80 100644
--- a/src/web/app/pages-instructor/instructor-session-edit-page/__snapshots__/instructor-session-edit-page.component.spec.ts.snap
+++ b/src/web/app/pages-instructor/instructor-session-edit-page/__snapshots__/instructor-session-edit-page.component.spec.ts.snap
@@ -1141,12 +1141,12 @@ exports[`InstructorSessionEditPageComponent should snap with feedback session qu
                     class="row text-center"
                   >
                     <div
-                      class="ngb-tooltip-class col-12 text-md-start ms-md-2"
-                      ngbtooltip="Amount of time the system will continue accepting submissions after the specified deadline."
+                      class="col-12 text-md-start ms-md-2"
                     >
                       <label
-                        class="control-label font-bold"
+                        class="ngb-tooltip-class control-label font-bold"
                         for="grace-period"
+                        ngbtooltip="Amount of time the system will continue accepting submissions after the specified deadline."
                       >
                          Grace period 
                       </label>
@@ -3825,12 +3825,12 @@ exports[`InstructorSessionEditPageComponent should snap with new question added
                     class="row text-center"
                   >
                     <div
-                      class="ngb-tooltip-class col-12 text-md-start ms-md-2"
-                      ngbtooltip="Amount of time the system will continue accepting submissions after the specified deadline."
+                      class="col-12 text-md-start ms-md-2"
                     >
                       <label
-                        class="control-label font-bold"
+                        class="ngb-tooltip-class control-label font-bold"
                         for="grace-period"
+                        ngbtooltip="Amount of time the system will continue accepting submissions after the specified deadline."
                       >
                          Grace period 
                       </label>
diff --git a/src/web/app/pages-instructor/instructor-sessions-page/__snapshots__/instructor-sessions-page.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-sessions-page/__snapshots__/instructor-sessions-page.component.spec.ts.snap
index 4640dbd87ca..9f58dee3590 100644
--- a/src/web/app/pages-instructor/instructor-sessions-page/__snapshots__/instructor-sessions-page.component.spec.ts.snap
+++ b/src/web/app/pages-instructor/instructor-sessions-page/__snapshots__/instructor-sessions-page.component.spec.ts.snap
@@ -1078,12 +1078,12 @@ exports[`InstructorSessionsPageComponent should snap when new session form is ex
                       class="row text-center"
                     >
                       <div
-                        class="ngb-tooltip-class col-12 text-md-start ms-md-2"
-                        ngbtooltip="Amount of time the system will continue accepting submissions after the specified deadline."
+                        class="col-12 text-md-start ms-md-2"
                       >
                         <label
-                          class="control-label font-bold"
+                          class="ngb-tooltip-class control-label font-bold"
                           for="grace-period"
+                          ngbtooltip="Amount of time the system will continue accepting submissions after the specified deadline."
                         >
                            Grace period 
                         </label>