diff --git a/js/layouts/activity-panel/activity-panel.js b/js/layouts/activity-panel/activity-panel.js
index 093d673d9..07f39bbeb 100644
--- a/js/layouts/activity-panel/activity-panel.js
+++ b/js/layouts/activity-panel/activity-panel.js
@@ -244,7 +244,9 @@ $(function()
 				}
 				// - Processing / cleanup when the leaving page
 				$(window).on('unload', function() {
-					return me._onUnload();
+					if (true === me._HasDraftEntries()) {
+						return me._onUnload();
+					}
 				});
 
 				// Mostly for outside clicks that should close elements