diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-shopkeepers-table/shopkeeper-dialogs/new-shopkeeper-dialog/new-shopkeeper-dialog.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-shopkeepers-table/shopkeeper-dialogs/new-shopkeeper-dialog/new-shopkeeper-dialog.component.ts
index 967c1be..4656f21 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-shopkeepers-table/shopkeeper-dialogs/new-shopkeeper-dialog/new-shopkeeper-dialog.component.ts
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-shopkeepers-table/shopkeeper-dialogs/new-shopkeeper-dialog/new-shopkeeper-dialog.component.ts
@@ -126,8 +126,14 @@ export class NewShopkeeperDialogComponent implements OnInit {
       }
     });
 
+    this.finalDataSource.paginator = this.paginatorForFinal;
+    this.finalDataSource.sort = this.sortForFinal;
+
     this.selection.clear();
 
+    this.dataSourceWithAllitems.sort = this.sort;
+    this.dataSourceWithAllitems.paginator = this.paginator;
+
     stepper.next();
   }