From bb4a661cd613be2a2b1999ded38d4bb09682ce1c Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Thu, 22 Jul 2021 21:33:33 +0200
Subject: [PATCH] Fix activatable blocks on drop. Closes #3579

---
 src/block_manager/view/BlockView.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/block_manager/view/BlockView.js b/src/block_manager/view/BlockView.js
index b6f00816d..fe59d23b5 100644
--- a/src/block_manager/view/BlockView.js
+++ b/src/block_manager/view/BlockView.js
@@ -99,14 +99,15 @@ export default Backbone.View.extend({
     if (result) {
       const oldKey = 'activeOnRender';
       const oldActive = result.get && result.get(oldKey);
+      const toActive = model.get('activate') || oldActive;
 
-      if (model.get('activate') || oldActive) {
-        result.trigger('active');
-        result.unset(oldKey);
+      if (model.get('select') || toActive) {
+        em.setSelected(result);
       }
 
-      if (model.get('select')) {
-        em.setSelected(result);
+      if (toActive) {
+        result.trigger('active');
+        result.unset(oldKey);
       }
 
       if (model.get('resetId')) {