From c99f3d585d7921a6e614187d97a9ae3a67d1c186 Mon Sep 17 00:00:00 2001
From: Cynthia Lin <cynthialin1004@gmail.com>
Date: Mon, 2 Oct 2017 15:41:13 -0700
Subject: [PATCH] hotkeys: Prevent lightbox closing when message view hotkey is
 pressed.

Fixes #6757.
---
 static/js/hotkey.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/hotkey.js b/static/js/hotkey.js
index 64f45f1e2b..26e885b8c5 100644
--- a/static/js/hotkey.js
+++ b/static/js/hotkey.js
@@ -420,8 +420,8 @@ exports.process_hotkey = function (e, hotkey) {
             subs.keyboard_sub();
             return true;
         }
-        if (overlays.lightbox_open()) {
-            overlays.close_active();
+        if (event_name === 'show_lightbox' && overlays.lightbox_open()) {
+            overlays.close_overlay('lightbox');
             return true;
         }
         return false;