diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in
index 5e61a9e94..40c8e7c3a 100644
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -118,5 +118,13 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+	<key>NSAppTransportSecurity</key>  
+	<dict>
+		<!-- Disable App Transport Security. Resolves https://github.com/SoftFever/OrcaSlicer/issues/791 -->
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>  
+		<key>NSAllowsArbitraryLoadsInWebContent</key>
+		<true/>
+	</dict>
 </dict>
 </plist>
diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp
index 13102fd98..5830d1379 100644
--- a/src/slic3r/GUI/PrinterWebView.cpp
+++ b/src/slic3r/GUI/PrinterWebView.cpp
@@ -30,6 +30,8 @@ PrinterWebView::PrinterWebView(wxWindow *parent)
         return;
     }
 
+    Bind(wxEVT_WEBVIEW_ERROR, &PrinterWebView::OnError, this);
+
     SetSizer(topsizer);
 
     topsizer->Add(m_browser, wxSizerFlags().Expand().Proportion(1));
@@ -83,6 +85,38 @@ void PrinterWebView::OnClose(wxCloseEvent& evt)
     this->Hide();
 }
 
+void PrinterWebView::OnError(wxWebViewEvent &evt)
+{
+    auto e = "unknown error";
+    switch (evt.GetInt()) {
+      case wxWEBVIEW_NAV_ERR_CONNECTION:
+        e = "wxWEBVIEW_NAV_ERR_CONNECTION";
+        break;
+      case wxWEBVIEW_NAV_ERR_CERTIFICATE:
+        e = "wxWEBVIEW_NAV_ERR_CERTIFICATE";
+        break;
+      case wxWEBVIEW_NAV_ERR_AUTH:
+        e = "wxWEBVIEW_NAV_ERR_AUTH";
+        break;
+      case wxWEBVIEW_NAV_ERR_SECURITY:
+        e = "wxWEBVIEW_NAV_ERR_SECURITY";
+        break;
+      case wxWEBVIEW_NAV_ERR_NOT_FOUND:
+        e = "wxWEBVIEW_NAV_ERR_NOT_FOUND";
+        break;
+      case wxWEBVIEW_NAV_ERR_REQUEST:
+        e = "wxWEBVIEW_NAV_ERR_REQUEST";
+        break;
+      case wxWEBVIEW_NAV_ERR_USER_CANCELLED:
+        e = "wxWEBVIEW_NAV_ERR_USER_CANCELLED";
+        break;
+      case wxWEBVIEW_NAV_ERR_OTHER:
+        e = "wxWEBVIEW_NAV_ERR_OTHER";
+        break;
+      }
+    BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(": error loading page %1% %2% %3% %4%") %evt.GetURL() %evt.GetTarget() %e %evt.GetString();
+}
+
 
 
 } // GUI
diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp
index 4356268d6..bdf5f4c68 100644
--- a/src/slic3r/GUI/PrinterWebView.hpp
+++ b/src/slic3r/GUI/PrinterWebView.hpp
@@ -38,6 +38,7 @@ public:
     void load_url(wxString& url);
     void UpdateState();
     void OnClose(wxCloseEvent& evt);
+    void OnError(wxWebViewEvent& evt);
 
 private:
 
diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp
index 74efaa67b..36cf241ee 100644
--- a/src/slic3r/GUI/Widgets/WebView.cpp
+++ b/src/slic3r/GUI/Widgets/WebView.cpp
@@ -218,7 +218,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
 #ifndef __WIN32__
         });
 #endif
-        webView->EnableContextMenu(false);
+        webView->EnableContextMenu(true);
     } else {
         BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": failed. Use fake web view.";
         webView = new FakeWebView;