diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java
index a3bbd4778..e62737b70 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java
@@ -79,7 +79,7 @@ public class PixelScene extends Scene {
 		}
 
 		defaultZoom = ShatteredPixelDungeon.scale();
-		if (defaultZoom < Game.density){
+		if (defaultZoom < Math.ceil( Game.density * 2 )){
 			defaultZoom = (int)Math.ceil( Game.density * 2.5 );
 			while ((
 				Game.width / defaultZoom < minWidth ||
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
index 1395ebd7c..6cf3164ff 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
@@ -103,12 +103,13 @@ public class WndSettings extends Window {
 				protected void onClick() {
 					super.onClick();
 					setScale++;
-					if (setScale > PixelScene.maxDefaultZoom) setScale = (int)Math.ceil(Game.density);
+					if (setScale > PixelScene.maxDefaultZoom) setScale = (int)Math.ceil(2*Game.density);
 					this.text(Utils.format(TXT_SCALE, setScale));
 				}
 			};
 			btnScaleUp.setRect( 0, 0, WIDTH, BTN_HEIGHT );
-			add( btnScaleUp );
+			btnScaleUp.enable(PixelScene.maxDefaultZoom > Math.ceil(2*Game.density));
+			add(btnScaleUp);
 
 			btnImmersive = new CheckBox( TXT_IMMERSIVE ) {
 				@Override