diff --git a/packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee b/packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee
index d4b4a4cdd169..6a0d28b870b3 100644
--- a/packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee
+++ b/packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee
@@ -26,6 +26,7 @@ Template.flexTabBar.events
RocketChat.TabBar.setTemplate @template, ->
$('.flex-tab')?.find("input[type='text']:first")?.focus()
$('.flex-tab .content')?.scrollTop(0)
+ $('').appendTo($(document.body)).remove()
Template.flexTabBar.onCreated ->
# close flex if the visible group changed and the opened template is not in the new visible group
diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee
index 3251aa498768..470b1a9fca76 100644
--- a/packages/rocketchat-ui-master/master/main.coffee
+++ b/packages/rocketchat-ui-master/master/main.coffee
@@ -213,6 +213,9 @@ Template.main.events
else
menu.close()
+ 'transitionend .main-content': ->
+ $('').appendTo($(document.body)).remove()
+
Template.main.onRendered ->