Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas
===================================================================
diff -u -r239 -r240
--- AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 239)
+++ AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 240)
@@ -35,14 +35,14 @@
 implementation
 
 uses
-  UiContext, DnaCodeService, Agent, CommonFunctions;
+  UiContext, DnaCodeService, Agent, CommonFunctions, ProScanMain;
 
 {$R *.dfm}
 
 procedure TfmDnaCodeReedsGescandScherm.btnTerugClick(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrDnaCode;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmDnaCodeReedsGescandScherm.btnVerplaatsenClick(Sender: TObject);
@@ -103,14 +103,13 @@
     Response.Free;
   end;
   if Self.ModalResult = mrDnaCode then
-    CloseModal;
+    (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmDnaCodeReedsGescandScherm.Wegnemen;
 var
   Response: DnaCodeAfmeldenResponse;
 begin
-  Self.ModalResult := mrDnaCode;
   Response := TAgent.Create(UiContext).DnaCodeAfmelden(UiContext.LaatsteDnaCode,UiContext.Toelevering,UiContext.Pallet,-1);
   try
     if Response.Header.Status <> '200' then begin
@@ -119,6 +118,7 @@
   finally
     Response.Free;
   end;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 end.