diff --git a/src/main/java/de/tr7zw/firstperson/mixins/GameRendererMixin.java b/src/main/java/de/tr7zw/firstperson/mixins/GameRendererMixin.java
index 0ac44efe..cee7a5e3 100644
--- a/src/main/java/de/tr7zw/firstperson/mixins/GameRendererMixin.java
+++ b/src/main/java/de/tr7zw/firstperson/mixins/GameRendererMixin.java
@@ -6,16 +6,37 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import de.tr7zw.firstperson.FirstPersonModelMod;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.Items;
 
 @Mixin(GameRenderer.class)
 public class GameRendererMixin {
 
+	// Bobbing needs to be disabled for the minimap to work(and not bob), but everywhere else it should work
+	// This does the job in vanilla but there is probably a better way (probably fixing the minimap^^)
+	private int allowBob = 0;
+
 	@Inject(at = @At("HEAD"), method = "bobView", cancellable = true)
 	private void bobView(MatrixStack matrixStack_1, float float_1, CallbackInfo info) {
+		if (--allowBob == 0 || !hasMapInHand()) {
+			// Allow bob
+		} else {
 		if(FirstPersonModelMod.enabled)
 			info.cancel();
+		}
+	}
+	
+	private boolean hasMapInHand() {
+		return MinecraftClient.getInstance().player.getMainHandStack().getItem() == Items.FILLED_MAP ||
+				MinecraftClient.getInstance().player.getOffHandStack().getItem() == Items.FILLED_MAP;
+	}
+
+	@Inject(at = @At("HEAD"), method = "renderHand")
+	private void renderHand(MatrixStack matrixStack, Camera camera, float f, CallbackInfo info) {
+		allowBob = 3;
 	}
 
 }