diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 77f098b2..92f4fe38 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -25,6 +25,13 @@
 
 <p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>
 
+<h3>Version 0.9.44 beta1</h3>
+
+<ol>
+    <li><b>FIX:</b> Last song in the song view not showing up.</a>.
+    </li>
+</ol>
+
 <h3>Version 0.9.43</h3>
 
 <ol>
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
index 247d8c9f..1c83d347 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
@@ -45,6 +45,12 @@ public class ShuffleButtonSongAdapter extends SongAdapter {
         return super.getIdentifier(position);
     }
 
+    @Override
+    public int getItemCount() {
+        int superItemCount = super.getItemCount();
+        return superItemCount == 0 ? 0 : superItemCount + 1;
+    }
+
     @Override
     public int getItemViewType(int position) {
         return position == 0 ? SHUFFLE_BUTTON : SONG;