diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/AbsOffsetSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/AbsOffsetSongAdapter.java
index 65c77791..b75170dd 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/AbsOffsetSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/AbsOffsetSongAdapter.java
@@ -93,7 +93,7 @@ public abstract class AbsOffsetSongAdapter extends SongAdapter {
 
         @Override
         public void onClick(View v) {
-            if (isInQuickSelectMode()) {
+            if (isInQuickSelectMode() && getItemViewType() != OFFSET_ITEM) {
                 toggleChecked(getAdapterPosition());
             } else {
                 MusicPlayerRemote.openQueue(dataSet, getAdapterPosition() - 1, true);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java
index c09bfa89..db6acd7b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java
@@ -10,7 +10,6 @@ import android.view.View;
 
 import com.kabouzeid.appthemehelper.ThemeStore;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.util.MusicUtil;
@@ -72,28 +71,6 @@ public class PlaylistSongAdapter extends AbsOffsetSongAdapter {
             return R.menu.menu_item_cannot_delete_single_songs_playlist_song;
         }
 
-        @Override
-        protected Song getSong() {
-            if (getItemViewType() == OFFSET_ITEM) return Song.EMPTY_SONG;
-            return dataSet.get(getAdapterPosition() - 1);
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (isInQuickSelectMode()) {
-                toggleChecked(getAdapterPosition());
-            } else {
-                MusicPlayerRemote.openQueue(dataSet, getAdapterPosition() - 1, true);
-            }
-        }
-
-        @Override
-        public boolean onLongClick(View view) {
-            if (getItemViewType() == OFFSET_ITEM) return false;
-            toggleChecked(getAdapterPosition());
-            return true;
-        }
-
         @Override
         protected boolean onSongMenuItemClick(MenuItem item) {
             if (item.getItemId() == R.id.action_go_to_album) {