Fix EscapeActions click in handling

Fixes a bug introduced in 07cc454 and one introduced in 22e854c.

1 files changed, 8 insertions, 3 deletions

diff --git a/client/config/router.js b/client/config/router.js
index 4545f220..ef874c5b 100644
--- a/client/config/router.js
+++ b/client/config/router.js
@@ -14,9 +14,14 @@ FlowRouter.route('/', {
 FlowRouter.route('/b/:id/:slug', {
   name: 'board',
   action: function(params) {
-    EscapeActions.executeAll();
-
-    Session.set('currentBoard', params.id);
+    let currentBoard = params.id;
+    // If we close a card, we'll execute again this route action but we don't
+    // want to excape every current actions (filters, etc.)
+    if (Session.get('currentBoard') !== currentBoard) {
+      EscapeActions.executeAll();
+    }
+
+    Session.set('currentBoard', currentBoard);
     Session.set('currentCard', null);
 
     BlazeLayout.render('defaultLayout', { content: 'board' });