diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt
index 6c859aeeb8..20b05de660 100644
--- a/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt
@@ -88,6 +88,10 @@ class SearchFragment : Fragment() {
             it?.let { showNoInternetError(it) }
         })
 
+        searchViewModel.isSearched.observe(this, Observer {
+            it?.let { showSearchLayout(!it) }
+        })
+
         rootView.timeTextView.setOnClickListener {
             val intent = Intent(activity, SearchTimeActivity::class.java)
             startActivity(intent)
@@ -135,8 +139,6 @@ class SearchFragment : Fragment() {
             override fun onQueryTextSubmit(query: String): Boolean {
                 // Do your search
                 searchViewModel.searchEvent = query
-                rootView.searchLinearLayout.visibility = View.GONE
-                rootView.fabSearch.visibility = View.GONE
                 if (searchViewModel.savedLocation != null && TextUtils.isEmpty(rootView.locationTextView.text.toString()) && rootView.timeTextView.text == "Anytime")
                     searchViewModel.loadEvents(searchViewModel.savedLocation.nullToEmpty(), searchViewModel.savedDate.nullToEmpty())
                 else
@@ -159,6 +161,11 @@ class SearchFragment : Fragment() {
         super.onPrepareOptionsMenu(menu)
     }
 
+    private fun showSearchLayout(show: Boolean) {
+        rootView.searchLinearLayout.visibility = if (show) View.VISIBLE else View.GONE
+        rootView.fabSearch.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
     fun handleVisibility(events: List<Event>) {
         rootView.noSearchResults.visibility = if (events.isEmpty()) View.VISIBLE else View.GONE
     }
diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt
index 871fada171..b02af83202 100644
--- a/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt
@@ -23,12 +23,14 @@ class SearchViewModel(private val eventService: EventService, private val prefer
     val events = MutableLiveData<List<Event>>()
     val error = MutableLiveData<String>()
     val showNoInternetError = MutableLiveData<Boolean>()
+    val isSearched = MutableLiveData<Boolean>()
     var searchEvent: String? = null
     val savedLocation by lazy { preference.getString(tokenKey) }
     val savedDate by lazy { preference.getString(tokenKeyDate) }
     val savedNextDate by lazy { preference.getString(tokenKeyNextDate) }
 
     fun loadEvents(location: String, time: String) {
+        isSearched.value = true
         if (!isConnected()) return
         preference.putString(tokenKey, location)
         val query: String = if (TextUtils.isEmpty(location))