diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 528e47dbb8c3..71e4d3164a5a 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -288,7 +288,9 @@ gfx::Size NativeWindow::GetContentMinimumSize() const {
 gfx::Size NativeWindow::GetContentMaximumSize() const {
   gfx::Size maximum_size = GetContentSizeConstraints().GetMaximumSize();
 #if defined(OS_WIN)
-  return GetExpandedWindowSize(this, maximum_size);
+  return GetContentSizeConstraints().HasMaximumSize()
+             ? GetExpandedWindowSize(this, maximum_size)
+             : maximum_size;
 #else
   return maximum_size;
 #endif