diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt
index 25c20b4a..13f95119 100644
--- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt
+++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt
@@ -3,11 +3,9 @@ package com.cyder.android.syncpod.viewmodel
 import android.databinding.ObservableArrayList
 import android.databinding.ObservableField
 import android.databinding.ObservableList
-import android.view.inputmethod.EditorInfo
 import com.cyder.android.syncpod.model.Video
 import com.cyder.android.syncpod.repository.VideoRepository
 import com.cyder.android.syncpod.repository.YouTubeRepository
-import com.cyder.android.syncpod.view.activity.SearchVideoActivity
 import com.cyder.android.syncpod.view.helper.Navigator
 import com.cyder.android.syncpod.viewmodel.base.ActivityViewModel
 import javax.inject.Inject
@@ -41,18 +39,16 @@ class SearchVideoActivityViewModel @Inject constructor(
 
     fun onBackButtonClicked() = navigator.closeActivity()
 
-    fun onEnterKeyClicked(actionId: Int): Boolean {
-        if (actionId == EditorInfo.IME_ACTION_SEARCH) {
-            val word = searchWord.get() ?: ""
-            videoViewModels.removeAll(videoViewModels)
-            repository.getYouTubeSearch(word)
-                    .map { convertToViewModel(it) }
-                    .subscribe({
-                        videoViewModels.addAll(it)
-                    }, {
-                        
-                    })
-        }
+    fun onEnterKeyClicked(): Boolean {
+        val word = searchWord.get() ?: ""
+        videoViewModels.clear()
+        repository.getYouTubeSearch(word)
+                .map { convertToViewModel(it) }
+                .subscribe({
+                    videoViewModels.addAll(it)
+                }, {
+
+                })
         return false
     }
 
diff --git a/app/src/main/res/layout/activity_search_video.xml b/app/src/main/res/layout/activity_search_video.xml
index 5582b801..7aef522d 100644
--- a/app/src/main/res/layout/activity_search_video.xml
+++ b/app/src/main/res/layout/activity_search_video.xml
@@ -34,7 +34,7 @@
                 android:imeOptions="actionSearch"
                 android:inputType="text"
                 android:text="@={viewModel.searchWord}"
-                app:onEnterClick="@{(v, id, event) -> viewModel.onEnterKeyClicked(id)}">
+                app:onEnterClick="@{(v, id, event) -> viewModel.onEnterKeyClicked()}">
 
                 <requestFocus />
             </EditText>