diff --git a/src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html b/src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html
index 3cb1befcf4e..b5c657d4f98 100644
--- a/src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html
+++ b/src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html
@@ -33,10 +33,11 @@ <h5 i18n>Enter a title for the new lesson</h5>
         mat-button
         class="mat-raised-button mat-primary"
         (click)="submit()"
-        [disabled]="!addLessonFormGroup.valid"
-        i18n
+        [disabled]="!addLessonFormGroup.valid || submitting"
+        class="button--progress"
       >
-        Submit
+        <mat-progress-bar *ngIf="submitting" mode="indeterminate"/>
+        <ng-container i18n>Submit</ng-container>
       </button>
     </div>
   </div>
diff --git a/src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.ts b/src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.ts
index b93ebd2a2c0..7de3dc6664e 100644
--- a/src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.ts
+++ b/src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.ts
@@ -13,6 +13,7 @@ export class AddLessonConfigureComponent {
   protected addLessonFormGroup: FormGroup = this.fb.group({
     title: new FormControl('', [Validators.required])
   });
+  protected submitting: boolean;
   protected target: string;
   @ViewChild('titleField') titleField: ElementRef;
 
@@ -32,6 +33,7 @@ export class AddLessonConfigureComponent {
   }
 
   protected submit(): void {
+    this.submitting = true;
     const newLesson = this.projectService.createGroup(
       this.addLessonFormGroup.controls['title'].value
     );
diff --git a/src/assets/wise5/authoringTool/structure/configure-structure.component.ts b/src/assets/wise5/authoringTool/structure/configure-structure.component.ts
index ed5805fe87f..67cf555ae88 100644
--- a/src/assets/wise5/authoringTool/structure/configure-structure.component.ts
+++ b/src/assets/wise5/authoringTool/structure/configure-structure.component.ts
@@ -12,6 +12,7 @@ export abstract class ConfigureStructureComponent {
   protected target: string;
   private structure: any = {};
   private structureDir: string = 'assets/wise5/authoringTool/structure';
+  protected submitting: boolean;
 
   constructor(
     private http: HttpClient,
@@ -58,6 +59,7 @@ export abstract class ConfigureStructureComponent {
   }
 
   protected submit(): void {
+    this.submitting = true;
     this.structure = this.injectUniqueIds(this.structure);
     this.addNodesToProject(this.structure.nodes);
     const target = history.state.target;
diff --git a/src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html b/src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html
index 3031b99ad6c..c8e40929b69 100644
--- a/src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html
+++ b/src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html
@@ -23,6 +23,15 @@ <h5 i18n>Jigsaw</h5>
     </button>
     <span fxFlex></span>
     <button mat-button color="primary" routerLink="../../.." i18n>Cancel</button>
-    <button mat-raised-button color="primary" (click)="submit()" i18n>Submit</button>
+    <button
+      mat-raised-button
+      color="primary"
+      (click)="submit()"
+      [disabled]="submitting"
+      class="button--progress"
+    >
+      <mat-progress-bar *ngIf="submitting" mode="indeterminate" />
+      <ng-container i18n>Submit</ng-container>
+    </button>
   </div>
 </div>
diff --git a/src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html b/src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html
index 84885e6ab2a..1e7c7c03706 100644
--- a/src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html
+++ b/src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html
@@ -14,6 +14,15 @@ <h5 i18n>KI Lesson with OER</h5>
     </button>
     <span fxFlex></span>
     <button mat-button color="primary" routerLink="../../.." i18n>Cancel</button>
-    <button mat-raised-button color="primary" (click)="submit()" i18n>Submit</button>
+    <button
+      mat-raised-button
+      color="primary"
+      (click)="submit()"
+      [disabled]="submitting"
+      class="button--progress"
+    >
+      <mat-progress-bar *ngIf="submitting" mode="indeterminate" />
+      <ng-container i18n>Submit</ng-container>
+    </button>
   </div>
 </div>
diff --git a/src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html b/src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html
index 06ee00ca888..5a3325599ff 100644
--- a/src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html
+++ b/src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html
@@ -12,6 +12,15 @@ <h5 i18n>Peer Review & Revision</h5>
     </button>
     <span fxFlex></span>
     <button mat-button color="primary" routerLink="../../.." i18n>Cancel</button>
-    <button mat-raised-button color="primary" (click)="submit()" i18n>Submit</button>
+    <button
+      mat-raised-button
+      color="primary"
+      (click)="submit()"
+      [disabled]="submitting"
+      class="button--progress"
+    >
+      <mat-progress-bar *ngIf="submitting" mode="indeterminate" />
+      <ng-container i18n>Submit</ng-container>
+    </button>
   </div>
 </div>
diff --git a/src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html b/src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html
index 4419a66eab6..d85da7bd87e 100644
--- a/src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html
+++ b/src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html
@@ -13,6 +13,15 @@ <h5 i18n>Self-Directed Investigation</h5>
     </button>
     <span fxFlex></span>
     <button mat-button color="primary" routerLink="../../.." i18n>Cancel</button>
-    <button mat-raised-button color="primary" (click)="submit()" i18n>Submit</button>
+    <button
+      mat-raised-button
+      color="primary"
+      (click)="submit()"
+      [disabled]="submitting"
+      class="button--progress"
+    >
+      <mat-progress-bar *ngIf="submitting" mode="indeterminate"/>
+      <ng-container i18n>Submit</ng-container>
+    </button>
   </div>
 </div>
diff --git a/src/messages.xlf b/src/messages.xlf
index 5dcde7ee056..8ad4ecf0432 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -1542,6 +1542,10 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="sourcefile">src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html</context>
           <context context-type="linenumber">77</context>
@@ -1556,19 +1560,19 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">34</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">25</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">23</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">24</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html</context>
@@ -9271,17 +9275,6 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">64,66</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="b570c9b6f5d96fb6f6969cb9397019829c34e82c" datatype="html">
-        <source> Submit </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html</context>
-          <context context-type="linenumber">38,40</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
-          <context context-type="linenumber">59,61</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="891f639ffcf9d31aea80ea7e8e428a6597b059b3" datatype="html">
         <source>Step Title</source>
         <context-group purpose="location">
@@ -22089,6 +22082,13 @@ If this problem continues, let your teacher know and move on to the next activit
           <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="b570c9b6f5d96fb6f6969cb9397019829c34e82c" datatype="html">
+        <source> Submit </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
+          <context context-type="linenumber">59,61</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="e4c201ad39e5fa4658b22a707c94012bc30e0846" datatype="html">
         <source>Dismiss all alerts</source>
         <context-group purpose="location">