Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r94 -r96
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 94)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 96)
@@ -9,7 +9,7 @@
 type
   TfmProScanHoofdscherm = class(TForm)
     procedure FormCreate(Sender: TObject);
-    procedure FormShow(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
   private
     fUiContext: TUiContext;
     fHuidigScherm: TForm;
@@ -35,22 +35,7 @@
 
 {$R *.dfm}
 
-procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
-begin
-  fUiContext := TUiContext.Create();
-  //fImagesScherm := TImagesScherm.Create(Self);
-  fLoginScherm := TfmLoginScherm.Create(Self);
-  fHomeScherm := TfmHomeScherm.Create(Self);
-  fPalletScherm := TfmPalletScherm.Create(Self);
-  fBestaandePalletScherm := TfmBestaandePalletScherm.Create(Self);
-  fDnaCodeScherm := TfmDnaCodeScherm.Create(Self);
-  fInfoLogScherm := TfmInfoLogScherm.Create(Self);
-  fHernoemPalletScherm := TfmHernoemPalletScherm.Create(Self);
-
-  fHuidigScherm := fLoginScherm;
-end;
-
-procedure TfmProScanHoofdscherm.FormShow(Sender: TObject);
+procedure TfmProScanHoofdscherm.FormActivate(Sender: TObject);
 var
   fModalResult: TModalResult;
 begin
@@ -76,6 +61,20 @@
   Application.Terminate;
 end;
 
+procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
+begin
+  fUiContext := TUiContext.Create();
+  fLoginScherm := TfmLoginScherm.Create(Self);
+  fHomeScherm := TfmHomeScherm.Create(Self);
+  fPalletScherm := TfmPalletScherm.Create(Self);
+  fBestaandePalletScherm := TfmBestaandePalletScherm.Create(Self);
+  fDnaCodeScherm := TfmDnaCodeScherm.Create(Self);
+  fInfoLogScherm := TfmInfoLogScherm.Create(Self);
+  fHernoemPalletScherm := TfmHernoemPalletScherm.Create(Self);
+
+  fHuidigScherm := fLoginScherm;
+end;
+
 procedure TfmProScanHoofdscherm.HuidigeGebruikerAfmelden;
 var
   Service: GebruikerServiceSoap;