diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
index 14005734..0675ebc7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -95,6 +95,16 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
             holder.title.setText(playlist.name);
         }
 
+        if (holder.getAdapterPosition() == getItemCount() - 1) {
+            if (holder.shortSeparator != null) {
+                holder.shortSeparator.setVisibility(View.GONE);
+            }
+        } else {
+            if (holder.shortSeparator != null && !(dataSet.get(position) instanceof AbsSmartPlaylist)) {
+                holder.shortSeparator.setVisibility(View.VISIBLE);
+            }
+        }
+
         if (holder.image != null) {
             holder.image.setImageDrawable(Util.getTintedDrawable(
                     activity,
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
index dc6933df..4ebadffd 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
@@ -95,6 +95,16 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
             holder.selectedIndicator.setVisibility(isChecked ? View.VISIBLE : View.GONE);
         }
 
+        if (holder.getAdapterPosition() == getItemCount() - 1) {
+            if (holder.shortSeparator != null) {
+                holder.shortSeparator.setVisibility(View.GONE);
+            }
+        } else {
+            if (holder.shortSeparator != null) {
+                holder.shortSeparator.setVisibility(View.VISIBLE);
+            }
+        }
+
         if (holder.title != null) {
             holder.title.setText(getAlbumTitle(album));
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
index 15d80b17..d0e11449 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
@@ -98,6 +98,16 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
             holder.selectedIndicator.setVisibility(isChecked ? View.VISIBLE : View.GONE);
         }
 
+        if (holder.getAdapterPosition() == getItemCount() - 1) {
+            if (holder.shortSeparator != null) {
+                holder.shortSeparator.setVisibility(View.GONE);
+            }
+        } else {
+            if (holder.shortSeparator != null) {
+                holder.shortSeparator.setVisibility(View.VISIBLE);
+            }
+        }
+
         if (holder.title != null) {
             holder.title.setText(artist.name);
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java
index 08aa77a7..f35df230 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java
@@ -69,6 +69,17 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
         final TextView songTitle = (TextView) convertView.findViewById(R.id.title);
         final TextView songInfo = (TextView) convertView.findViewById(R.id.text);
         final ImageView albumArt = (ImageView) convertView.findViewById(R.id.image);
+        final View shortSeparator = convertView.findViewById(R.id.short_separator);
+
+        if (position == getCount() - 1) {
+            if (shortSeparator != null) {
+                shortSeparator.setVisibility(View.GONE);
+            }
+        } else {
+            if (shortSeparator != null) {
+                shortSeparator.setVisibility(View.VISIBLE);
+            }
+        }
 
         songTitle.setText(song.title);
         songInfo.setText(song.albumName);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
index abfbcb0b..41eb67bc 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
@@ -95,6 +95,16 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
             holder.selectedIndicator.setVisibility(isChecked ? View.VISIBLE : View.GONE);
         }
 
+        if (holder.getAdapterPosition() == getItemCount() - 1) {
+            if (holder.shortSeparator != null) {
+                holder.shortSeparator.setVisibility(View.GONE);
+            }
+        } else {
+            if (holder.shortSeparator != null) {
+                holder.shortSeparator.setVisibility(View.VISIBLE);
+            }
+        }
+
         if (holder.title != null) {
             holder.title.setText(getSongTitle(song));
         }