diff --git a/qad_application/historyview.cpp b/qad_application/historyview.cpp
index 175e1d4..a0e7c44 100644
--- a/qad_application/historyview.cpp
+++ b/qad_application/historyview.cpp
@@ -119,6 +119,8 @@ void HistoryView::clear(bool silent) {
 	QListWidget::clear();
 	if (!silent) addEntry(-1);
 	emit clearAvailable(false);
+	emit redoAvailable(index < count());
+	emit undoAvailable((index > 1));
 }
 
 
@@ -131,7 +133,7 @@ void HistoryView::undo() {
 
 
 void HistoryView::redo() {
-	if (index > count()) return;
+	if (index >= count()) return;
 	index++;
 	emit commandExecute(history_[index - 1].command);
 	itemSelectionChanged();