diff --git a/linphone-desktop/src/components/notifier/Notifier.cpp b/linphone-desktop/src/components/notifier/Notifier.cpp
index 6719504db..27fc761ea 100644
--- a/linphone-desktop/src/components/notifier/Notifier.cpp
+++ b/linphone-desktop/src/components/notifier/Notifier.cpp
@@ -50,8 +50,8 @@
 
 // Arbitrary hardcoded values.
 #define NOTIFICATION_SPACING 10
-#define N_MAX_NOTIFICATIONS 15
-#define MAX_TIMEOUT 60000
+#define N_MAX_NOTIFICATIONS 5
+#define MAX_TIMEOUT 30000
 
 using namespace std;
 
@@ -181,11 +181,11 @@ void Notifier::deleteNotification (QVariant notification) {
   instance->property(NOTIFICATION_PROPERTY_TIMER).value<QTimer *>()->stop();
 
   mInstancesNumber--;
+  Q_ASSERT(mInstancesNumber >= 0);
+
   if (mInstancesNumber == 0)
     mOffset = 0;
 
-  Q_ASSERT(mInstancesNumber >= 0);
-
   mMutex.unlock();
 
   instance->deleteLater();
diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml b/linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml
index cdd303a0c..3c517eb4f 100644
--- a/linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml
+++ b/linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml
@@ -36,7 +36,7 @@ DesktopPopup {
 
   // ---------------------------------------------------------------------------
 
-  flags: Qt.Popup
+  flags: Qt.Window | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint
 
   Component.onCompleted: {
     var window = _window = data[0]