Index: trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDcorrectTabKeyNavigationOrder.java
===================================================================
--- trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDcorrectTabKeyNavigationOrder.java	(revision 1332)
+++ trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDcorrectTabKeyNavigationOrder.java	(revision 1432)
@@ -119,6 +119,16 @@
         while (index < sequence.size()) {
             if (mustCorrectTabKeyNavigationOrder(sequence, index)) {
-                result.add(sequence.get(index + 1));
-                result.add(sequence.get(index));
+                Event event1 = sequence.get(index);
+                Event event2 = sequence.get(index + 1);
+                
+                // switch timestamps
+                long timestamp1 = event1.getTimestamp();
+                event1.setTimestamp(event2.getTimestamp());
+                event2.setTimestamp(timestamp1);
+                
+                // change order of events
+                result.add(event2);
+                result.add(event1);
+                
                 index += 2;
             }
