diff --git a/app/view/preferences/Preferences.js b/app/view/preferences/Preferences.js
index 8bc2eb39..00245bc7 100644
--- a/app/view/preferences/Preferences.js
+++ b/app/view/preferences/Preferences.js
@@ -101,6 +101,12 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,boxLabel: locale['preferences[5]']
 						,value: config.auto_launch
 					}
+					,{
+						 xtype: 'checkbox'
+						,name: 'flash_frame'
+						,boxLabel: locale['preferences[flash_frame]']
+						,value: config.flash_frame
+					}
 					,{
 						 xtype: 'checkbox'
 						,name: 'start_minimized'
diff --git a/electron/main.js b/electron/main.js
index f1601c5c..52af6f8d 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -22,6 +22,7 @@ const config = new Config({
 		,hide_menu_bar: false
 		,window_display_behavior: 'taskbar_tray'
 		,auto_launch: !isDev
+		,flash_frame: true
 		,window_close_behavior: 'keep_in_tray'
 		,start_minimized: false
 		,systemtray_indicator: true
@@ -271,7 +272,9 @@ function updateBadge(title) {
 		app.setBadgeCount(messageCount);
 	}
 
-	if ( messageCount > 0 && !mainWindow.isFocused() ) mainWindow.flashFrame(true);
+	if ( messageCount > 0 && !mainWindow.isFocused() && config.get('flash_frame') ) {
+		mainWindow.flashFrame(true);
+	}
 }
 
 ipcMain.on('setBadge', function(event, messageCount, value) {