1 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index a12c43e..d79a9b9 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -513,7 +513,7 @@ void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
 KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   KOrg::BaseView(calendar,parent,name)
 { 
-
+    mIsActiveWindow = false;
     mCurItem = 0;
     mCurItemRootParent = 0;
     mCurItemParent = 0;
@@ -950,6 +950,7 @@ void KOTodoView::storeCurrentItem()
     mCurItemRootParent = 0;
     mCurItemParent = 0;
     mCurItemAbove = 0; 
+    mIsActiveWindow = topLevelWidget()->isActiveWindow();
     mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
     if (mActiveItem) {
         mCurItem = mActiveItem->todo();
@@ -1018,6 +1019,7 @@ void KOTodoView::resetCurrentItem()
 }
 void KOTodoView::resetFocusToList()
 {
+    if ( mIsActiveWindow ) 
     topLevelWidget()->setActiveWindow();
     mTodoListView->setFocus();
 }