diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 0a17b1787b52..6a105ab7dca1 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -227,6 +227,16 @@ NativeWindowViews::NativeWindowViews(content::WebContents* web_contents,
       use_content_size_)
     bounds = ContentBoundsToWindowBounds(bounds);
 
+#if defined(OS_WIN)
+  if (!has_frame_) {
+    // Set Window style so that we get a minimize and maximize animation when
+    // frameless.
+    DWORD frame_style = WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX |
+                        WS_CAPTION;
+    ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
+  }
+#endif
+
   window_->UpdateWindowIcon();
   window_->CenterWindow(bounds.size());
   Layout();