diff --git a/src/view/AccountPanel.cpp b/src/view/AccountPanel.cpp
index 1eaf1d3..c656d8a 100644
--- a/src/view/AccountPanel.cpp
+++ b/src/view/AccountPanel.cpp
@@ -910,8 +910,11 @@ void AccountPanel::OnMenuGenerate()
         month = _curMonth;
     }
 
+    _wxUI->setEnabled(false);
     GenerateDialog g(_kiss, _wxUI, month, year);
+    g.setModal(true);
     g.exec();
+    _wxUI->setEnabled(true);
 }
 
 void AccountPanel::OnMenuDelete()
diff --git a/src/view/GenerateDialog.cpp b/src/view/GenerateDialog.cpp
index 25aecce..cfebe69 100644
--- a/src/view/GenerateDialog.cpp
+++ b/src/view/GenerateDialog.cpp
@@ -95,7 +95,7 @@ GenerateDialog::GenerateDialog(KissCount* kiss, wxUI *parent, int month, int yea
 
     if (year == -1)
     {
-        _yearTo->setCurrentIndex(9);
+        _yearTo->setCurrentIndex(10);
         _monthTo->setCurrentIndex(curDate.month());
     }
     else
@@ -208,8 +208,10 @@ void GenerateDialog::OnOK()
     }
     yearTo = _yearTo->itemText(_yearTo->currentIndex()).toInt();
 
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
     close();
     _kiss->GenerateMonth(monthFrom, yearFrom, monthTo, yearTo);
+    QApplication::restoreOverrideCursor();
 }
 
 void GenerateDialog::OnCancel()