diff --git a/public/language/en-GB/admin/settings/notifications.json b/public/language/en-GB/admin/settings/notifications.json
index da6c9680a3..03fa0ac66a 100644
--- a/public/language/en-GB/admin/settings/notifications.json
+++ b/public/language/en-GB/admin/settings/notifications.json
@@ -2,5 +2,6 @@
"notifications": "Notifications",
"welcome-notification": "Welcome Notification",
"welcome-notification-link": "Welcome Notification Link",
- "welcome-notification-uid": "Welcome Notification User (UID)"
+ "welcome-notification-uid": "Welcome Notification User (UID)",
+ "notification-alert-timeout": "Notification Alert Timeout"
}
\ No newline at end of file
diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js
index 92574f3eb1..c9be4b87d8 100644
--- a/public/src/modules/notifications.js
+++ b/public/src/modules/notifications.js
@@ -70,7 +70,7 @@ define('notifications', ['sounds', 'translator', 'components', 'navigator', 'ben
var payload = {
alert_id: 'new_notif',
title: '[[notifications:new_notification]]',
- timeout: 2000,
+ timeout: parseInt(config.notificationAlertTimeout, 10) || 5000,
};
if (notifData.path) {
diff --git a/src/controllers/api.js b/src/controllers/api.js
index ed8ad64700..b969b7be8a 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -62,6 +62,7 @@ apiController.loadConfig = function (req, callback) {
config.bootswatchSkin = meta.config.bootswatchSkin || 'noskin';
config.defaultBootswatchSkin = meta.config.bootswatchSkin || 'noskin';
config.enablePostHistory = parseInt(meta.config.enablePostHistory || 1, 10) === 1;
+ config.notificationAlertTimeout = parseInt(meta.config.notificationAlertTimeout, 10) || 5000;
if (config.useOutgoingLinksPage) {
config.outgoingLinksWhitelist = meta.config['outgoingLinks:whitelist'];
diff --git a/src/views/admin/settings/notifications.tpl b/src/views/admin/settings/notifications.tpl
index 3e68295699..1f1af27037 100644
--- a/src/views/admin/settings/notifications.tpl
+++ b/src/views/admin/settings/notifications.tpl
@@ -7,6 +7,8 @@
[[admin/settings/notifications:welcome-notification]]
[[admin/settings/notifications:welcome-notification-link]]
[[admin/settings/notifications:welcome-notification-uid]]
+
+ [[admin/settings/notifications:notification-alert-timeout]]