diff --git a/core/src/com/riiablo/Cursor.java b/core/src/com/riiablo/Cursor.java
index f5b76804..c77405db 100644
--- a/core/src/com/riiablo/Cursor.java
+++ b/core/src/com/riiablo/Cursor.java
@@ -78,9 +78,7 @@ public class Cursor {
   }
 
   public void setItem(Item item) {
-    if (this.item != null) {
-      Riiablo.audio.play(this.item.base.dropsound, true);
-    } else if (item != null) {
+    if (this.item == null && item != null) {
       Riiablo.audio.play("item_pickup", true);
     }
 
diff --git a/core/src/com/riiablo/panel/InventoryPanel.java b/core/src/com/riiablo/panel/InventoryPanel.java
index cf3b632f..dd42ef48 100644
--- a/core/src/com/riiablo/panel/InventoryPanel.java
+++ b/core/src/com/riiablo/panel/InventoryPanel.java
@@ -319,6 +319,7 @@ public class InventoryPanel extends WidgetGroup implements Disposable {
               return;
             }
 
+            Riiablo.audio.play(cursor.base.dropsound, true);
             Riiablo.cursor.setItem(item);
             item = cursor;
             gameScreen.player.setSlot(InventoryPanel.BodyPart.this.bodyLoc, item);
diff --git a/core/src/com/riiablo/panel/ItemGrid.java b/core/src/com/riiablo/panel/ItemGrid.java
index e36374db..049fc45b 100644
--- a/core/src/com/riiablo/panel/ItemGrid.java
+++ b/core/src/com/riiablo/panel/ItemGrid.java
@@ -89,6 +89,7 @@ public class ItemGrid extends Group {
 
         Item cursor = Riiablo.cursor.getItem();
         if (cursor != null) {
+          Riiablo.audio.play(cursor.base.dropsound, true);
           if (swap != null) {
             Riiablo.cursor.setItem(swap.item);
             removeActor(swap);