diff --git a/plugins/plugins/frontend/public/javascripts/countly.views.js b/plugins/plugins/frontend/public/javascripts/countly.views.js
index b9761c13843..c18295cce04 100644
--- a/plugins/plugins/frontend/public/javascripts/countly.views.js
+++ b/plugins/plugins/frontend/public/javascripts/countly.views.js
@@ -614,7 +614,7 @@
                 });
             },
             onFocus: function() {
-                if (this.searchQuery === "") {
+                if (this.searchQuery) {
                     this.back = true;
                     this.selectedConfigSearchBar = "search";
                 }
@@ -624,6 +624,8 @@
                 self.unpatch();
                 var res = {};
                 if (self.searchQuery && self.searchQuery !== "") {
+                    self.back = true;
+                    self.selectedConfigSearchBar = "search";
                     self.searchQuery = self.searchQuery.toLowerCase();
                     for (var config in self.predefinedStructure) {
                         if (config.toLowerCase().includes(self.searchQuery) && CountlyHelpers.isPluginEnabled(config.toLowerCase())) {