Index: AAPClient/UI/PalletScherm.pas
===================================================================
diff -u -r211 -r240
--- AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 211)
+++ AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 240)
@@ -19,6 +19,7 @@
     procedure edtPalletKeyUp(Sender: TObject; var Key: Word;
       Shift: TShiftState);
     procedure btnGenereerTbpClick(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
   private
     procedure SetContext;
   public
@@ -31,14 +32,14 @@
 implementation
 
 uses
-  DnaCodeService, UiContext, Agent;
+  DnaCodeService, UiContext, Agent, ProScanMain;
 
 {$R *.dfm}
 
 procedure TfmPalletScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrHome;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
 end;
 
 procedure TfmPalletScherm.actVolgendeExecute(Sender: TObject);
@@ -82,7 +83,7 @@
   end else begin
     Self.ModalResult := mrPallet;
   end;
-
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmPalletScherm.btnGenereerTbpClick(Sender: TObject);
@@ -117,16 +118,20 @@
   end;
 end;
 
+procedure TfmPalletScherm.FormActivate(Sender: TObject);
+begin
+  inherited;
+  ActiveControl := edtPallet;
+end;
+
 procedure TfmPalletScherm.FormShow(Sender: TObject);
 begin
   btnLinksOnder.Action := nil;
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actVolgende;
   edtPallet.Text := '';
   SetContext;
-  ActiveControl := edtPallet;
   inherited;
-
 end;
 
 procedure TfmPalletScherm.SetContext;