diff --git a/src/main/java/io/bitsquare/gui/components/SystemNotification.java b/src/main/java/io/bitsquare/gui/components/SystemNotification.java
index 16f72abed0..3b3712e7d0 100644
--- a/src/main/java/io/bitsquare/gui/components/SystemNotification.java
+++ b/src/main/java/io/bitsquare/gui/components/SystemNotification.java
@@ -32,7 +32,10 @@ public class SystemNotification {
     private static final Notification.Notifier notifier = NotifierBuilder.create().build();
 
     public static void openInfoNotification(String headline, String message) {
-        notifier.notify(NotificationBuilder.create().title(headline).message(message).build());
+        // On windows it causes problems with the hidden stage used in the hansolo Notification implementation
+        // Lets deactivate it for the moment and fix that with a more native-like or real native solution later.
+        String os = System.getProperty("os.name").toLowerCase();
+        if (!os.contains("win"))
+            notifier.notify(NotificationBuilder.create().title(headline).message(message).build());
     }
-
 }