diff --git a/src/main/java/net/wurstclient/hacks/NoBackgroundHack.java b/src/main/java/net/wurstclient/hacks/NoBackgroundHack.java
index fd215824..41ccc81a 100644
--- a/src/main/java/net/wurstclient/hacks/NoBackgroundHack.java
+++ b/src/main/java/net/wurstclient/hacks/NoBackgroundHack.java
@@ -19,7 +19,7 @@ import net.wurstclient.settings.CheckboxSetting;
 public final class NoBackgroundHack extends Hack
 {
 	public final CheckboxSetting allGuis = new CheckboxSetting("All GUIs",
-		"Removes the background for all GUIs", false);
+		"Removes the background for all GUIs, not just inventories.", false);
 	
 	public NoBackgroundHack()
 	{
@@ -33,13 +33,13 @@ public final class NoBackgroundHack extends Hack
 		if(!isEnabled())
 			return false;
 		
-		if(screen instanceof HandledScreen)
-			return true;
+		if(MC.world == null)
+			return false;
 		
-		if(allGuis.isChecked() && MC.world != null)
-			return true;
+		if(!allGuis.isChecked() && !(screen instanceof HandledScreen))
+			return false;
 		
-		return false;
+		return true;
 	}
 	
 	// See ScreenMixin.onRenderBackground()
diff --git a/src/main/java/net/wurstclient/mixin/ScreenMixin.java b/src/main/java/net/wurstclient/mixin/ScreenMixin.java
index 204bd6f2..36fa5fc8 100644
--- a/src/main/java/net/wurstclient/mixin/ScreenMixin.java
+++ b/src/main/java/net/wurstclient/mixin/ScreenMixin.java
@@ -37,7 +37,8 @@ public abstract class ScreenMixin extends AbstractParentElement
 		cancellable = true)
 	public void onRenderBackground(MatrixStack matrices, CallbackInfo ci)
 	{
-		if(WurstClient.INSTANCE.getHax().noBackgroundHack.shouldCancelBackground((Screen)(Object)this))
+		if(WurstClient.INSTANCE.getHax().noBackgroundHack
+			.shouldCancelBackground((Screen)(Object)this))
 			ci.cancel();
 	}