diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index 716f52ed95..4231d1f82b 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -118,9 +118,10 @@ define([
 
         show: function() {
             var top = $('#app-title').height() + $('#toolbar').height() + 2,
-                left = Common.Utils.innerWidth() - $('#right-menu').width() - this.options.width - 32;
+                left = Common.Utils.innerWidth() - ($('#right-menu').is(':visible') ? $('#right-menu').width() : 0) - this.options.width - 32;
             Common.UI.Window.prototype.show.call(this, left, top);
 
+            this.inputSearch.val('');
             this.focus();
         },
 
@@ -154,7 +155,7 @@ define([
 
         onOpenPanel: function () {
             this.hide();
-            this.fireEvent('search:show', [true]);
+            this.fireEvent('search:show', [true, this.inputSearch.val()]);
         },
 
         textFind: 'Find'
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 764175cec7..798fe92f8b 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -271,6 +271,10 @@ define([
             Common.localStorage.setBool('sse-search-options-extended', this.extendedOptions);
         },
 
+        setFindText: function (val) {
+            this.inputText.setValue(val);
+        },
+
         textFind: 'Find',
         textFindAndReplace: 'Find and replace',
         textCloseSearch: 'Close search',
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 1cd72977c8..944fbcaa7f 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -921,10 +921,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, action) {
+        onShowHideSearch: function (state, findText, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
                 var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                findText && this.leftMenu.panelSearch.setFindText(findText);
                 this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index b261e8b6bc..75bffea04b 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -333,13 +333,13 @@ define([
                     cls     : 'btn-toolbar'
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
-                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
                 if ( !Common.UI.Themes.isDarkTheme() ) {
                     me.header.menuItemsDarkMode.hide();
                     me.header.menuItemsDarkMode.$el.prev('.divider').hide();
                 }
             }
+            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
         },
 
         onLayoutChanged: function(area) {
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index 3932f5c485..5f941717ca 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -774,10 +774,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, action) {
+        onShowHideSearch: function (state, findText, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
                 var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                findText && this.leftMenu.panelSearch.setFindText(findText);
                 this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index 93d0721826..7eb4a417a8 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -342,8 +342,8 @@ define([
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
-                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
             }
+            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
         },
 
         onLayoutChanged: function(area) {
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 76d56330a8..58974f57f6 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -983,10 +983,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, action) {
+        onShowHideSearch: function (state, findText, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
                 var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                findText && this.leftMenu.panelSearch.setFindText(findText);
                 this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index fc15ad3ada..817b8cc826 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -348,8 +348,8 @@ define([
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
-                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
             }
+            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
         },
 
         // When our application is ready, lets get started