Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r232 -r240
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 232)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 240)
@@ -31,6 +31,7 @@
     procedure edtDnaCodeKeyPress(Sender: TObject; var Key: Char);
     procedure FormCreate(Sender: TObject);
     procedure btnInfoClick(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
   private
     fImagesScherm: TImagesScherm;
     procedure MeldDnaCodeAf();
@@ -50,14 +51,14 @@
 implementation
 
 uses
-  UiContext, Agent, CommonFunctions;
+  UiContext, Agent, CommonFunctions, ProScanMain;
 
 {$R *.dfm}
 
 procedure TfmDnaCodeScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrHome;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
 end;
 
 procedure TfmDnaCodeScherm.actPalletExecute(Sender: TObject);
@@ -81,7 +82,7 @@
       Self.ModalResult := mrDnaCode;
     end;
   end;
-
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 function TfmDnaCodeScherm.BepaalAantalLadesOpHuidigePallet: integer;
@@ -130,6 +131,7 @@
     UiContext.InfoLogSchermToonGescand := true;
     Self.ModalResult := mrInfoLog;
   end;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.actAfrondenExecute(Sender: TObject);
@@ -154,6 +156,7 @@
     end;
 
   end;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.edtDnaCodeKeyPress(Sender: TObject; var Key: Char);
@@ -166,6 +169,12 @@
   end;
 end;
 
+procedure TfmDnaCodeScherm.FormActivate(Sender: TObject);
+begin
+  inherited;
+  ActiveControl := edtDnaCode;
+end;
+
 procedure TfmDnaCodeScherm.FormCreate(Sender: TObject);
 begin
   inherited;
@@ -178,7 +187,6 @@
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actAfronden;
   edtDnaCode.Text := '';
-  ActiveControl := edtDnaCode;
   lblHuidigePalletData.Caption := UiContext.Pallet;
   lblToeleveringData.Caption := UiContext.Toelevering;
   lblAantalGescand.Caption := '';
@@ -194,7 +202,6 @@
     imgWegwerpPallet.Visible := false;
   end;
   ZetIcoontjesBovenaan;
-
   inherited;
 end;
 
@@ -231,6 +238,7 @@
   finally
     Response.Free;
   end;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.PalletBijwerken(Status: DnaCodeStatus;
@@ -250,6 +258,7 @@
   finally
     Response.Free;
   end;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.ToeleveringDataOphalen;
@@ -272,6 +281,7 @@
   finally
     Response.Free;
   end;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.VerwerkMogelijkePopups(EersteDnaCode: DnaCode);
@@ -336,6 +346,7 @@
   finally
     Response.Free;
   end;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 end.