diff --git a/src/main/java/musicplayer/PlayerGUI.java b/src/main/java/musicplayer/PlayerGUI.java
index 65dfde4..b932eac 100644
--- a/src/main/java/musicplayer/PlayerGUI.java
+++ b/src/main/java/musicplayer/PlayerGUI.java
@@ -426,18 +426,15 @@ public class PlayerGUI implements PlayerCallbackInterface, LibraryCallbackInterf
         @Override
         public void mousePressed(MouseEvent e) {
             int selRow = libraryView.getRowForLocation(e.getX(), e.getY());
+            if(e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 2 && selRow != -1)
             try {
                 Object selectedItem = ((DefaultMutableTreeNode) libraryView.getPathForLocation(e.getX(), e.getY()).getLastPathComponent()).getUserObject();
-                if (selRow != -1) {
-                    if (e.getClickCount() == 2) {
-                        if (selectedItem != null) {
-                            if (selectedItem instanceof Song) {
-                                addToPlaylist((Song) selectedItem);
-                            } else if (selectedItem instanceof Album) {
-                                ((Album) selectedItem).getSongs().forEach(PlayerGUI.this::addToPlaylist);
-                            }
+                    if (selectedItem != null) {
+                        if (selectedItem instanceof Song) {
+                            addToPlaylist((Song) selectedItem);
+                        } else if (selectedItem instanceof Album) {
+                            ((Album) selectedItem).getSongs().forEach(PlayerGUI.this::addToPlaylist);
                         }
-                    }
                 }
             } catch (NullPointerException ignored) {
             }