diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java
index c9d6d11b4..3c38b5fef 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java
@@ -60,7 +60,7 @@ public class Bag extends Item implements Iterable<Item> {
 
 		super.execute( hero, action );
 
-		if (action.equals( AC_OPEN )) {
+		if (action.equals( AC_OPEN ) && !items.isEmpty()) {
 			
 			GameScene.show( new WndQuickBag( this ) );
 			
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuickBag.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuickBag.java
index da0190e6f..6138e2d3d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuickBag.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuickBag.java
@@ -67,11 +67,6 @@ public class WndQuickBag extends Window {
 
 		Collections.sort(items, quickBagComparator);
 
-		if (items.isEmpty()){
-			hide();
-			return;
-		}
-
 		int btnWidth = 16;
 		int btnHeight = 20;