diff --git a/src/axes.jl b/src/axes.jl
index 37ea8eaa..cfd63b5d 100644
--- a/src/axes.jl
+++ b/src/axes.jl
@@ -853,4 +853,4 @@ end
 reverse_if(x, cond) = cond ? reverse(x) : x
 axis_tuple(x, y, letter) = reverse_if((x, y), letter === :y)
 
-axes_shift(t, i) = i % 3 == 0 ? t : i % 3 == 1 ? (t[3], t[1], t[2]) : (t[2], t[3], t[1])
\ No newline at end of file
+axes_shift(t, i) = i % 3 == 0 ? t : i % 3 == 1 ? (t[3], t[1], t[2]) : (t[2], t[3], t[1])
diff --git a/src/recipes.jl b/src/recipes.jl
index 246f7bb7..46ef79a1 100644
--- a/src/recipes.jl
+++ b/src/recipes.jl
@@ -1520,8 +1520,8 @@ end
     yflip := true
     aspect_ratio := 1
     rs, cs, zs = Plots.findnz(z.surf)
-    xlims := ignorenan_extrema(cs)
-    ylims := ignorenan_extrema(rs)
+    xlims := widen(ignorenan_extrema(cs)..., get(plotattributes, :xscale, :identity))
+    ylims := widen(ignorenan_extrema(rs)..., get(plotattributes, :yscale, :identity))
     markershape --> :circle
     markersize --> 1
     markerstrokewidth := 0