diff --git a/include/wx/msw/webview_edge.h b/include/wx/msw/webview_edge.h
index fa33d16755..e04748f463 100644
--- a/include/wx/msw/webview_edge.h
+++ b/include/wx/msw/webview_edge.h
@@ -113,8 +113,6 @@ private:
 
     void OnTopLevelParentIconized(wxIconizeEvent& event);
 
-    bool RunScriptSync(const wxString& javascript, wxString* output = NULL) const;
-
     wxDECLARE_DYNAMIC_CLASS(wxWebViewEdge);
 };
 
diff --git a/src/msw/webview_edge.cpp b/src/msw/webview_edge.cpp
index ba213385ec..9dce63b27b 100644
--- a/src/msw/webview_edge.cpp
+++ b/src/msw/webview_edge.cpp
@@ -831,32 +831,37 @@ void wxWebViewEdge::MSWSetBrowserExecutableDir(const wxString & path)
     wxWebViewEdgeImpl::ms_browserExecutableDir = path;
 }
 
-bool wxWebViewEdge::RunScriptSync(const wxString& javascript, wxString* output) const
+bool wxWebViewEdge::RunScript(const wxString& javascript, wxString* output) const
 {
-    bool scriptExecuted = false;
     if (!m_impl->m_webView)
         return false;
 
+    wxJSScriptWrapper wrapJS(javascript, wxJSScriptWrapper::JS_OUTPUT_STRING);
+
+    int scriptResult = -1;
+    wxString scriptOutput;
+
     // Start script execution
-    HRESULT executionResult = m_impl->m_webView->ExecuteScript(javascript.wc_str(), Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
-        [&scriptExecuted, &executionResult, output](HRESULT error, PCWSTR result) -> HRESULT
+    HRESULT executionResult = m_impl->m_webView->ExecuteScript(wrapJS.GetWrappedCode().wc_str(), Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
+        [&scriptResult, &executionResult, &scriptOutput](HRESULT error, PCWSTR result) -> HRESULT
     {
         // Handle script execution callback
         if (error == S_OK)
         {
-            if (output)
-                output->assign(result);
+            scriptOutput.assign(result);
+            scriptResult = 1;
         }
         else
+        {
             executionResult = error;
-
-        scriptExecuted = true;
+            scriptResult = 0;
+        }
 
         return S_OK;
     }).Get());
 
     // Wait for script exection
-    while (!scriptExecuted)
+    while (scriptResult == -1)
         wxYield();
 
     if (FAILED(executionResult))
@@ -865,40 +870,22 @@ bool wxWebViewEdge::RunScriptSync(const wxString& javascript, wxString* output)
             output->Printf("%s (0x%08lx)", wxSysErrorMsgStr(executionResult), executionResult);
         return false;
     }
-    else
-        return true;
-}
 
-bool wxWebViewEdge::RunScript(const wxString& javascript, wxString* output) const
-{
-    wxJSScriptWrapper wrapJS(javascript, &m_runScriptCount);
+    wxString scriptDecodedResult;
+    // Try to decode JSON string or return original
+    // result if it's not a valid JSON string
+    if (!wxJSON::DecodeString(scriptOutput, &scriptDecodedResult))
+        scriptDecodedResult = scriptOutput;
 
-    // This string is also used as an error indicator: it's cleared if there is
-    // no error or used in the warning message below if there is one.
-    wxString result;
-    if (RunScriptSync(wrapJS.GetWrappedCode(), &result)
-        && result == wxS("true"))
-    {
-        if (RunScriptSync(wrapJS.GetUnwrappedOutputCode() + ";", &result))
-        {
-            if (output)
-                // Try to decode JSON string or return original
-                // result if it's not a valid JSON string
-                if (!wxJSON::DecodeString(result, output))
-                    *output = result;
-            result.clear();
-        }
+    wxString scriptExtractedOutput;
+    bool success = wxJSScriptWrapper::ExtractOutput(scriptDecodedResult, &scriptExtractedOutput);
+    if (!success)
+        wxLogWarning(_("Error running JavaScript: %s"), scriptExtractedOutput);
 
-        RunScriptSync(wrapJS.GetCleanUpCode());
-    }
+    if (output)
+        *output = scriptDecodedResult;
 
-    if (!result.empty())
-    {
-        wxLogWarning(_("Error running JavaScript: %s"), result);
-        return false;
-    }
-
-    return true;
+    return success;
 }
 
 bool wxWebViewEdge::AddScriptMessageHandler(const wxString& name)
diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 6b0f194dc7..6ed7dd6555 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -1045,40 +1045,25 @@ bool wxWebViewIE::RunScript(const wxString& javascript, wxString* output) const
         return false;
     }
 
-    wxJSScriptWrapper wrapJS(javascript, &m_runScriptCount);
+    wxJSScriptWrapper wrapJS(javascript, wxJSScriptWrapper::JS_OUTPUT_IE);
 
     wxAutomationObject scriptAO(scriptDispatch);
     wxVariant varResult;
 
-    wxString err;
-    if ( !CallEval(wrapJS.GetWrappedCode(), scriptAO, &varResult) )
-    {
-        err = _("failed to evaluate");
-    }
-    else if ( varResult.IsType("bool") && varResult.GetBool() )
-    {
-        if ( output != NULL )
-        {
-            if ( CallEval(wrapJS.GetOutputCode(), scriptAO, &varResult) )
-                *output = varResult.MakeString();
-            else
-                err = _("failed to retrieve execution result");
-        }
+    bool success = false;
+    wxString scriptOutput;
+    if ( CallEval(wrapJS.GetWrappedCode(), scriptAO, &varResult) )
+        success = wxJSScriptWrapper::ExtractOutput(varResult.MakeString(), &scriptOutput);
+    else
+        scriptOutput = _("failed to evaluate");
 
-        CallEval(wrapJS.GetCleanUpCode(), scriptAO, &varResult);
-    }
-    else // result available but not the expected "true"
-    {
-        err = varResult.MakeString();
-    }
+    if (!success)
+        wxLogWarning(_("Error running JavaScript: %s"), scriptOutput);
 
-    if ( !err.empty() )
-    {
-        wxLogWarning(_("Error running JavaScript: %s"), varResult.MakeString());
-        return false;
-    }
+    if (success && output)
+        *output = scriptOutput;
 
-    return true;
+    return success;
 }
 
 void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)