diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index a63ceeef..5b2eb747 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -2478,7 +2478,14 @@ config.defineOptions(EditSession.prototype, "session", {
             this.$wrap = value;
         },
         get: function() {
-            return this.getUseWrapMode() ? this.getWrapLimitRange().min || "free" : "off";
+            if (this.getUseWrapMode()) {
+                if (this.$wrap == -1)
+                    return "printMargin";
+                if (!this.getWrapLimitRange().min)
+                    return "free";
+                return this.$wrap;
+            }
+            return "off";
         },
         handlesSet: true
     },