diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 7545c2ee3..d78ea7905 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-17  Alex Roitman  <shura@gramps-project.org>
+	* src/GrampsDb/_GrampsDbBase.py (redo): Properly abort redo action
+	when no redo is available.
+
 2006-01-17  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/EventView.py (ui_definition): Add filter menu entry
 	* src/FamilyList.py (ui_definition): Add filter menu entry
diff --git a/gramps2/src/GrampsDb/_GrampsDbBase.py b/gramps2/src/GrampsDb/_GrampsDbBase.py
index 39285e7a0..f3c96f9f4 100644
--- a/gramps2/src/GrampsDb/_GrampsDbBase.py
+++ b/gramps2/src/GrampsDb/_GrampsDbBase.py
@@ -1209,14 +1209,14 @@ class GrampsDbBase(GrampsDBCallback):
         Accesses the last undone transaction, and reverts the data to
         the state before the transaction was undone.
         """
-        if self.undoindex == _UNDO_SIZE or self.readonly:
+        if self.undoindex >= _UNDO_SIZE or self.readonly:
             return False
 
-        self.undoindex +=1
-        transaction = self.translist[self.undoindex]
+        transaction = self.translist[self.undoindex+1]
         if transaction == None:
             return False
 
+        self.undoindex +=1
         mapbase = (self.person_map, self.family_map, self.source_map,
                    self.event_map, self.media_map, self.place_map)