diff --git a/src/view/GenerateDialog.cpp b/src/view/GenerateDialog.cpp
index 9019318..d1fb549 100644
--- a/src/view/GenerateDialog.cpp
+++ b/src/view/GenerateDialog.cpp
@@ -108,13 +108,11 @@ GenerateDialog::GenerateDialog(KissCount* kiss, wxUI *parent, int month, int yea
     }
     else
     {
-        _yearTo->Select(year-2000);
+        if (month == 11)
+	    year++;
+
+	_yearTo->Select(year-2000);
         OnYearToChange(event);
-        if (_ops[year].size())
-	{
-            month = _ops[year][0];
-	    _yearTo->Select(year-1999);
-	}
 
         if (month == -1)
             _monthTo->Select(0);
diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp
index 8bec55e..fb5885c 100644
--- a/src/view/grid/GridAccount.cpp
+++ b/src/view/grid/GridAccount.cpp
@@ -722,6 +722,8 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
 	pEditor->DecRef();
     }
 
+    if (new_op.amount < 0) new_op.amount *= -1;
+
     value = GetCellValue(row, CATEGORY);
     if (value.Length())
     {