diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
index 8ba7fc5c3..9a8c8a1b1 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
@@ -59,6 +59,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.SewerBossLevel;
 import com.shatteredpixel.shatteredpixeldungeon.levels.SewerLevel;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.StartScene;
+import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
 import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
 import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndResurrect;
@@ -71,7 +72,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashSet;
 
 public class Dungeon {
@@ -154,6 +154,7 @@ public class Dungeon {
 		Journal.reset();
 
 		quickslot.reset();
+        QuickSlotButton.reset();
 		
 		depth = 0;
 		gold = 0;
@@ -517,6 +518,7 @@ public class Dungeon {
 		Generator.reset();
 
 		quickslot.reset();
+        QuickSlotButton.reset();
 
         Dungeon.challenges = bundle.getInt( CHALLENGES );
 		
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
index 7dff31aa0..b0c0dbf0f 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
@@ -57,10 +57,14 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
 	public void destroy() {
 		super.destroy();
 		
-		instance = new QuickSlotButton[4];
-
-		lastTarget = null;
+		reset();
 	}
+
+    public static void reset() {
+        instance = new QuickSlotButton[4];
+
+        lastTarget = null;
+    }
 	
 	@Override
 	protected void createChildren() {