diff --git a/src/main/java/de/fraunhofer/iem/icognicrypt/results/ui/CogniCryptResultWindow.java b/src/main/java/de/fraunhofer/iem/icognicrypt/results/ui/CogniCryptResultWindow.java
index b0a377d..0901027 100644
--- a/src/main/java/de/fraunhofer/iem/icognicrypt/results/ui/CogniCryptResultWindow.java
+++ b/src/main/java/de/fraunhofer/iem/icognicrypt/results/ui/CogniCryptResultWindow.java
@@ -39,14 +39,14 @@ public CogniCryptResultWindow(ToolWindow toolWindow, Project project)
         IResultProvider service = ServiceManager.getService(project, IResultProvider.class);
         service.Subscribe(_tableModel);
 
-
-        for (Set<CogniCryptError> errorSet : service.GetErrors().values())
-        {
-            for (CogniCryptError error : errorSet)
-            {
-                _tableModel.AddError(error);
-            }
-        }
+//         ToolWindow clearing when starting IDE
+//        for (Set<CogniCryptError> errorSet : service.GetErrors().values())
+//        {
+//            for (CogniCryptError error : errorSet)
+//            {
+//                _tableModel.AddError(error);
+//            }
+//        }
     }
 
     @Override
diff --git a/src/main/java/de/fraunhofer/iem/icognicrypt/ui/NotificationProvider.java b/src/main/java/de/fraunhofer/iem/icognicrypt/ui/NotificationProvider.java
index 32e9604..0b55650 100644
--- a/src/main/java/de/fraunhofer/iem/icognicrypt/ui/NotificationProvider.java
+++ b/src/main/java/de/fraunhofer/iem/icognicrypt/ui/NotificationProvider.java
@@ -1,8 +1,14 @@
 package de.fraunhofer.iem.icognicrypt.ui;
 
+import com.intellij.ide.DataManager;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.project.Project;
+import static de.fraunhofer.iem.icognicrypt.IdeSupport.projects.ProjectHelper.GetActiveProject;
+
 
 public class NotificationProvider
 {
@@ -24,6 +30,12 @@ public static void ShowError(String message)
     private static void ShowNotification(String message, NotificationType type)
     {
         Notification notification = new Notification("CogniCrypt", "CogniCrypt Message", message, type);
-        Notifications.Bus.notify(notification);
+        Project project= GetActiveProject();
+        DataContext d = DataManager.getInstance().getDataContext();
+        Project project1= d.getData(PlatformDataKeys.PROJECT);
+        if(project==project1) {
+            Notifications.Bus.notify(notification, project);
+        }
+
     }
 }