diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
index 51214ae..f4a8a72 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -80,6 +80,7 @@
 
     @Override
     public void handleSelection(int eventType) {
+        mLauncher.getItemOnClickListener().onClick(this);
         SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
                 new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
@@ -87,12 +88,12 @@
     @Override
     public void onClick(View view) {
         handleSelection(SearchTargetEvent.SELECT);
-        mLauncher.getItemOnClickListener().onClick(view);
     }
 
     @Override
     public boolean onLongClick(View view) {
-        handleSelection(SearchTargetEvent.LONG_PRESS);
+        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, SearchTargetEvent.LONG_PRESS).build());
         return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index 6d85955..86ed436 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -104,7 +104,6 @@
         iconParams.height = mDeviceProfile.allAppsIconSizePx;
         iconParams.width = mDeviceProfile.allAppsIconSizePx;
         setOnClickListener(view -> handleSelection(SearchTargetEvent.SELECT));
-
     }