diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 30c278887a..71cfcc6cce 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1610,6 +1610,11 @@ void wxSocketBase::OnRequest(wxSocketNotify notification)
 
             // we're now successfully connected
             m_connected = true;
+            m_establishing = false;
+
+            // error was previously set to wxSOCKET_WOULDBLOCK, but this is not
+            // the case any longer
+            SetError(wxSOCKET_NOERROR);
             break;
 
         case wxSOCKET_LOST: