diff --git a/apps/pdfeditor/main/app/controller/ViewTab.js b/apps/pdfeditor/main/app/controller/ViewTab.js
index f28340f167..00cf530cd7 100644
--- a/apps/pdfeditor/main/app/controller/ViewTab.js
+++ b/apps/pdfeditor/main/app/controller/ViewTab.js
@@ -229,11 +229,13 @@ define([
                         if (me.view.btnInterfaceTheme.menu.getItemsLength(true)) {
                             // me.view.btnInterfaceTheme.setMenu(new Common.UI.Menu({items: menuItems}));
                             me.view.btnInterfaceTheme.menu.on('item:click', _.bind(function (menu, item) {
-                                Common.UI.TooltipManager.closeTip('modernTheme');
                                 var value = item.value;
                                 Common.UI.Themes.setTheme(value);
                                 Common.Utils.lockControls(Common.enumLock.inLightTheme, !Common.UI.Themes.isDarkTheme(), {array: [me.view.btnDarkDocument]});
                             }, me));
+                            me.view.btnInterfaceTheme.menu.on('show:after', function () {
+                                Common.UI.TooltipManager.closeTip('modernTheme');
+                            });
 
                             setTimeout(function () {
                                 me.onContentThemeChangedToDark(Common.UI.Themes.isContentThemeDark());
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index 1d6ea2c733..c116411f8e 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -603,10 +603,12 @@ define([
 
                         if (me.btnInterfaceTheme.menu.getItemsLength(true)) {
                             me.btnInterfaceTheme.menu.on('item:click', _.bind(function (menu, item) {
-                                Common.UI.TooltipManager.closeTip('modernTheme');
                                 var value = item.value;
                                 Common.UI.Themes.setTheme(value);
                             }, me));
+                            me.btnInterfaceTheme.menu.on('show:after', function () {
+                                Common.UI.TooltipManager.closeTip('modernTheme');
+                            });
                         }
                     }