diff --git a/app/src/main/java/com/aurora/store/compose/composables/SearchSuggestionComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/SearchSuggestionComposable.kt
index 44fea29cd..83853e861 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/SearchSuggestionComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/SearchSuggestionComposable.kt
@@ -48,7 +48,12 @@ fun SearchSuggestionComposable(
         modifier = modifier
             .fillMaxWidth()
             .clickable(onClick = { onClick(searchSuggestEntry.title) })
-            .padding(dimensionResource(R.dimen.padding_medium)),
+            .padding(
+                top = dimensionResource(R.dimen.padding_xsmall),
+                bottom = dimensionResource(R.dimen.padding_xsmall),
+                start = dimensionResource(R.dimen.padding_large),
+                end = dimensionResource(R.dimen.padding_xsmall)
+            ),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
diff --git a/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt
index 616b36987..4930f0793 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt
@@ -113,7 +113,7 @@ class SearchViewModel @Inject constructor(
 
     fun fetchSuggestions(query: String) {
         viewModelScope.launch(Dispatchers.IO) {
-            _suggestions.value = contract.searchSuggestions(query)
+            _suggestions.value = contract.searchSuggestions(query).take(3)
         }
     }
 }