diff --git a/panel/browser-panel-client.cpp b/panel/browser-panel-client.cpp
index d3744b400..7e8297412 100644
--- a/panel/browser-panel-client.cpp
+++ b/panel/browser-panel-client.cpp
@@ -213,6 +213,13 @@ bool QCefBrowserClient::OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>
 	return true;
 }
 
+void QCefBrowserClient::OnBeforeClose(CefRefPtr<CefBrowser>)
+{
+	if (widget) {
+		emit widget->CloseSafely();
+	}
+}
+
 bool QCefBrowserClient::OnSetFocus(CefRefPtr<CefBrowser>, CefFocusHandler::FocusSource source)
 {
 	/* Don't steal focus when the webpage navigates. This is especially
diff --git a/panel/browser-panel-client.hpp b/panel/browser-panel-client.hpp
index 2ec7320bf..43404c60b 100644
--- a/panel/browser-panel-client.hpp
+++ b/panel/browser-panel-client.hpp
@@ -57,6 +57,8 @@ class QCefBrowserClient : public CefClient,
 				   CefRefPtr<CefClient> &client, CefBrowserSettings &settings,
 				   CefRefPtr<CefDictionaryValue> &extra_info, bool *no_javascript_access) override;
 
+	virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) override;
+
 	/* CefFocusHandler */
 	virtual bool OnSetFocus(CefRefPtr<CefBrowser> browser, CefFocusHandler::FocusSource source) override;
 
diff --git a/panel/browser-panel-internal.hpp b/panel/browser-panel-internal.hpp
index 1516f4f17..cd36ca151 100644
--- a/panel/browser-panel-internal.hpp
+++ b/panel/browser-panel-internal.hpp
@@ -51,6 +51,7 @@ class QCefWidgetInternal : public QCefWidget {
 	virtual bool zoomPage(int direction) override;
 	virtual void executeJavaScript(const std::string &script) override;
 
+	void CloseSafely();
 	void Resize();
 
 #ifdef __linux__
@@ -61,4 +62,7 @@ class QCefWidgetInternal : public QCefWidget {
 
 public slots:
 	void Init();
+
+signals:
+	void readyToClose();
 };
diff --git a/panel/browser-panel.cpp b/panel/browser-panel.cpp
index 0d999cefa..9584a93c7 100644
--- a/panel/browser-panel.cpp
+++ b/panel/browser-panel.cpp
@@ -160,21 +160,24 @@ void QCefWidgetInternal::closeBrowser()
 {
 	CefRefPtr<CefBrowser> browser = cefBrowser;
 	if (!!browser) {
-		auto destroyBrowser = [](CefRefPtr<CefBrowser> cefBrowser) {
+		auto destroyBrowser = [=](CefRefPtr<CefBrowser> cefBrowser) {
 			CefRefPtr<CefClient> client = cefBrowser->GetHost()->GetClient();
 			QCefBrowserClient *bc = reinterpret_cast<QCefBrowserClient *>(client.get());
 
-			if (bc) {
-				bc->widget = nullptr;
-			}
-
 			cefBrowser->GetHost()->CloseBrowser(true);
 
 #if !defined(_WIN32) && !defined(__APPLE__) && CHROME_VERSION_BUILD >= 6533
-			while (cefBrowser && cefBrowser->IsValid()) {
-				os_sleep_ms(10);
-			}
+			QEventLoop loop;
+
+			connect(this, &QCefWidgetInternal::readyToClose, &loop, &QEventLoop::quit);
+
+			QTimer::singleShot(1000, &loop, &QEventLoop::quit);
+
+			loop.exec();
 #endif
+			if (bc) {
+				bc->widget = nullptr;
+			}
 		};
 
 		/* So you're probably wondering what's going on here.  If you
@@ -398,6 +401,11 @@ void QCefWidgetInternal::Resize()
 #endif
 }
 
+void QCefWidgetInternal::CloseSafely()
+{
+	emit readyToClose();
+}
+
 void QCefWidgetInternal::showEvent(QShowEvent *event)
 {
 	QWidget::showEvent(event);