diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/NotificationPanel.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/NotificationPanel.java
index f2d0bae1ca0..c24d96b860b 100644
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/NotificationPanel.java
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/NotificationPanel.java
@@ -48,7 +48,7 @@ public class NotificationPanel {
             @Override
             public void onPreviewNativeEvent(NativePreviewEvent event) {
                 Element target = Element.as(event.getNativeEvent().getEventTarget());
-                if (target == panel.getElement()) {
+                if (event.getTypeInt() == Event.ONCLICK && target == panel.getElement()) {
                     animation.cancel();
                 }
             }
@@ -71,7 +71,7 @@ public class NotificationPanel {
                     double relPr = (progress - FADE_OUT_PERCENT) / (1 - FADE_OUT_PERCENT);
                     panel.getElement().getStyle().setOpacity(1 - relPr);
                 } else {
-                    panel.getElement().getStyle().setOpacity(1);
+                    panel.getElement().getStyle().clearOpacity();
                 }
             }