diff --git a/CHANGELOG.md b/CHANGELOG.md
index adae252eb4..307297cb08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ Edge
 ### DEPRECATIONS & REMOVALS
 ### BUG FIXES
 
+* Removed dependency on deprecated SC.MENUPANE.VERTICAL_OFFSET property that could cause a height NaN error in SC.PickerPane
+
 1.11.1
 -----------
 
diff --git a/frameworks/desktop/panes/picker.js b/frameworks/desktop/panes/picker.js
index 572367072e..131bf1ddb8 100644
--- a/frameworks/desktop/panes/picker.js
+++ b/frameworks/desktop/panes/picker.js
@@ -939,7 +939,7 @@ SC.PickerPane = SC.PalettePane.extend(
 
     // If the height of the menu is bigger than the window height, resize it.
     if (frame.height + frame.y + 35 >= windowFrame.height) {
-      frame.height = windowFrame.height - frame.y - (SC.MenuPane.VERTICAL_OFFSET * 2);
+      frame.height = windowFrame.height - frame.y - (this.get('windowPadding') * 2);
     }
 
     return frame;