Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java	(revision 4524)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java	(revision 4525)
@@ -16,4 +16,5 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TableModelEvent;
 
 import org.openstreetmap.josm.actions.AbstractInfoAction;
@@ -82,4 +83,17 @@
     public void update(Observable o, Object arg) {
         repaint();
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.JTable#tableChanged(javax.swing.event.TableModelEvent)
+     */
+    @Override
+    public void tableChanged(TableModelEvent e) {
+        int selectedRow = getSelectedRow();
+        super.tableChanged(e);
+        // Restore list selection (fix #6899)
+        if (selectedRow > -1 && selectedRow < getRowCount()) {
+            getSelectionModel().setSelectionInterval(0, selectedRow);
+        }
     }