Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r169 -r170
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 169)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 170)
@@ -144,6 +144,7 @@
     Request.Header := Header;
     Request.DnaCode := edtDnaCode.Text;
     UiContext.LaatsteDnaCode := edtDnaCode.Text;
+    lblLaatstGescandData.Caption := Request.DnaCode;
     Request.Aantal := 1;
     Request.Toelevering := UiContext.Toelevering;
     Request.PalletCode := UiContext.Pallet;
@@ -163,7 +164,6 @@
                    ToonPopupScherm('GLS DIRECT', 'OK');
                    imgGls.Visible := Response.DnaCodes[0].IsGlsDirect;
                  end;
-                 lblLaatstGescandData.Caption := Request.DnaCode;
                  Self.ModalResult := mrDnaCode;
                end;
          1005: begin //reeds gescand
Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas
===================================================================
diff -u -r162 -r170
--- AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 162)
+++ AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 170)
@@ -19,6 +19,8 @@
     imgAnnuleren: TImage;
     lblAnnuleren: TLabel;
     procedure FormShow(Sender: TObject);
+    procedure imgAnnulerenClick(Sender: TObject);
+    procedure pnlAnnulerenClick(Sender: TObject);
   private
     { Private declarations }
   public
@@ -30,6 +32,9 @@
 
 implementation
 
+uses
+  UiContext;
+
 {$R *.dfm}
 
 procedure TfmDnaCodeReedsGescandScherm.FormShow(Sender: TObject);
@@ -40,4 +45,16 @@
   fImagesScherm.ilAlgemeen128.GetIcon(2, imgAnnuleren.Picture.Icon);
 end;
 
+procedure TfmDnaCodeReedsGescandScherm.imgAnnulerenClick(Sender: TObject);
+begin
+  inherited;
+  Self.ModalResult := mrDnaCode;
+end;
+
+procedure TfmDnaCodeReedsGescandScherm.pnlAnnulerenClick(Sender: TObject);
+begin
+  inherited;
+  Self.ModalResult := mrDnaCode;
+end;
+
 end.
Index: AAPClient/UI/DnaCodeReedsGescandScherm.dfm
===================================================================
diff -u -r162 -r170
--- AAPClient/UI/DnaCodeReedsGescandScherm.dfm	(.../DnaCodeReedsGescandScherm.dfm)	(revision 162)
+++ AAPClient/UI/DnaCodeReedsGescandScherm.dfm	(.../DnaCodeReedsGescandScherm.dfm)	(revision 170)
@@ -83,19 +83,21 @@
   end
   object pnlAnnuleren: TPanel [4]
     Left = 256
-    Top = 319
+    Top = 321
     Width = 157
     Height = 183
     BevelOuter = bvNone
     Color = 1513421
     ParentBackground = False
     TabOrder = 4
+    OnClick = pnlAnnulerenClick
     object imgAnnuleren: TImage
       Left = 14
       Top = 16
       Width = 128
       Height = 128
       Transparent = True
+      OnClick = imgAnnulerenClick
     end
     object lblAnnuleren: TLabel
       Left = 0