diff --git a/extension/_locales/en/messages.json b/extension/_locales/en/messages.json
--- a/extension/_locales/en/messages.json
+++ b/extension/_locales/en/messages.json
@@ -98,6 +98,15 @@
         "message": "Adds a \"Share...\" context menu entry and allows websites to open a dialog for sharing contents using the Web Share API."
     },
 
+    "options_plugin_captiveportal_title": {
+        "description": "Title for Captive Portal plugin",
+        "message": "Improved Captive Portal Handling"
+    },
+    "options_plugin_captiveportal_description": {
+        "description": "Description for Captive Portal plugin",
+        "message": "When a successful login to a captive portal is detected, network connectivity status is automatically refreshed."
+    },
+
     "options_plugin_breezeScrollBars_title": {
         "description": "Title for Breeze style scroll bars plugin",
         "message": "Use Breeze-style scroll bars"
diff --git a/extension/constants.js b/extension/constants.js
--- a/extension/constants.js
+++ b/extension/constants.js
@@ -37,6 +37,9 @@
     purpose: {
         enabled: true
     },
+    captiveportal: {
+        enabled: true
+    },
     breezeScrollBars: {
         // this breaks pages in interesting ways, disable by default
         enabled: false
@@ -52,3 +55,5 @@
 const MPRIS_WEBSITE_SETTINGS = {
     //"https://www.example.com": false
 };
+
+const CAPTIVE_PORTAL_NETWORKCHECK_URL = "http://networkcheck.kde.org/";
diff --git a/extension/extension-captiveportal.js b/extension/extension-captiveportal.js
new file mode 100644
--- /dev/null
+++ b/extension/extension-captiveportal.js
@@ -0,0 +1,75 @@
+/*
+    Copyright (C) 2019 Kai Uwe Broulik <kde@privat.broulik.de>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+let captivePortalTabId = -1;
+let delayCaptiveCheckTimeout = null;
+
+chrome.tabs.onCreated.addListener((tab) => {
+    if (tab.url !== CAPTIVE_PORTAL_NETWORKCHECK_URL) {
+        return;
+    }
+
+    sendPortMessageWithReply("captiveportal", "getConnectivity").then((reply) => {
+        if (reply.connectivity === "PORTAL") {
+            console.log("We're behind a captive portal, tracking tab", tab.id);
+            captivePortalTabId = tab.id;
+        }
+    });
+});
+
+chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
+    if (captivePortalTabId === -1 || tabId !== captivePortalTabId) {
+        return;
+    }
+
+    if (changeInfo.status !== "complete") {
+        return;
+    }
+
+    // if we're on KDE networkcheck page and it returns "OK",
+    // close the tab as we're connected successfully
+    if (tab.url === CAPTIVE_PORTAL_NETWORKCHECK_URL) {
+        chrome.tabs.executeScript(tab.id, {
+            code: `document.body.textContent == "OK\\n"`
+        }, (result) => {
+            console.log("Successfully navigated to networkcheck page, closing it");
+            chrome.tabs.remove(tab.id);
+        });
+    }
+
+    // Delay checking for connectivity a bit to avoid excess checks in case of multiple redirects
+    if (delayCaptiveCheckTimeout) {
+        return;
+    }
+
+    delayCaptiveCheckTimeout = setTimeout(() => {
+        sendPortMessageWithReply("captiveportal", "checkConnectivity").then((reply) => {
+            delayCaptiveCheckTimeout = null;
+
+            if (reply.connectivity === "FULL") {
+                console.log("We are now fully connected");
+                captivePortalTabId = -1;
+            }
+        });
+    }, 2000);
+});
+
+chrome.tabs.onRemoved.addListener((tabId) => {
+    if (tabId === captivePortalTabId) {
+        captivePortalTabId = -1;
+    }
+});
diff --git a/extension/manifest.json b/extension/manifest.json
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -30,6 +30,7 @@
         "extension-downloads.js",
         "extension-tabsrunner.js",
         "extension-purpose.js",
+        "extension-captiveportal.js",
 
         "extension.js"
     ],
diff --git a/extension/options.html b/extension/options.html
--- a/extension/options.html
+++ b/extension/options.html
@@ -83,6 +83,12 @@
             </label>
             <p data-i18n="options_plugin_purpose_description">I18N</p>
         </li>
+        <li data-requires-extension="captiveportal">
+            <label>
+                <input type="checkbox" data-extension="captiveportal" data-settings-key="enabled"> <span data-i18n="options_plugin_captiveportal_title">I18N</span>
+            </label>
+            <p data-i18n="options_plugin_captiveportal_description">I18N</p>
+        </li>
         <li data-not-show-in="firefox">
             <label>
                 <input type="checkbox" data-extension="breezeScrollBars" data-settings-key="enabled"> <span data-i18n="options_plugin_breezeScrollBars_title">I18N</span>
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -13,6 +13,7 @@
                 downloadjob.cpp
                 tabsrunnerplugin.cpp
                 purposeplugin.cpp
+                captiveportalplugin.cpp
                 )
 
 qt5_add_dbus_adaptor(HOST_SOURCES ../dbus/org.kde.plasma.browser_integration.TabsRunner.xml tabsrunnerplugin.h TabsRunnerPlugin)
diff --git a/host/captiveportalplugin.h b/host/captiveportalplugin.h
new file mode 100644
--- /dev/null
+++ b/host/captiveportalplugin.h
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2019 by Kai Uwe Broulik <kde@privat.broulik.de>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+*/
+
+#pragma once
+
+#include "abstractbrowserplugin.h"
+
+class CaptivePortalPlugin : public AbstractBrowserPlugin
+{
+    Q_OBJECT
+
+public:
+    explicit CaptivePortalPlugin(QObject *parent);
+    ~CaptivePortalPlugin() override;
+
+    using AbstractBrowserPlugin::handleData;
+    QJsonObject handleData(int serial, const QString &event, const QJsonObject &data) override;
+
+private:
+    static QString connectivityString(uint connectivity);
+
+};
diff --git a/host/captiveportalplugin.cpp b/host/captiveportalplugin.cpp
new file mode 100644
--- /dev/null
+++ b/host/captiveportalplugin.cpp
@@ -0,0 +1,123 @@
+/*
+    Copyright (C) 2019 by Kai Uwe Broulik <kde@privat.broulik.de>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+*/
+
+#include "captiveportalplugin.h"
+
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusPendingReply>
+
+static const QString s_networkManagerServiceName = QStringLiteral("org.freedesktop.NetworkManager");
+static const QString s_networkManagerObjectPath = QStringLiteral("/org/freedesktop/NetworkManager");
+static const QString s_networkManagerInterface = QStringLiteral("org.freedesktop.NetworkManager");
+
+static const QString s_dBusPropertiesInterface = QStringLiteral("org.freedesktop.DBus.Properties");
+
+CaptivePortalPlugin::CaptivePortalPlugin(QObject *parent)
+    : AbstractBrowserPlugin(QStringLiteral("captiveportal"), 1, parent)
+{
+
+}
+
+CaptivePortalPlugin::~CaptivePortalPlugin()
+{
+
+}
+
+QJsonObject CaptivePortalPlugin::handleData(int serial, const QString &event, const QJsonObject &data)
+{
+    Q_UNUSED(data)
+
+    if (event == QLatin1String("getConnectivity")) {
+
+        QDBusMessage msg = QDBusMessage::createMethodCall(s_networkManagerServiceName,
+                                                          s_networkManagerObjectPath,
+                                                          s_dBusPropertiesInterface,
+                                                          QStringLiteral("Get"));
+        msg.setArguments({
+            s_networkManagerInterface,
+            QStringLiteral("Connectivity")
+        });
+
+        QDBusPendingReply<QVariant> reply = QDBusConnection::systemBus().asyncCall(msg);
+        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
+        connect(watcher, &QDBusPendingCallWatcher::finished, this, [this, serial](QDBusPendingCallWatcher *watcher) {
+            QDBusPendingReply<QVariant> reply = *watcher;
+            watcher->deleteLater();
+
+            if (reply.isError()) {
+                sendReply(serial, {
+                    {QStringLiteral("connectivity"), QStringLiteral("ERROR")}
+                });
+                return;
+            }
+
+            sendReply(serial, {
+                {QStringLiteral("connectivity"), connectivityString(reply.value().toUInt())}
+            });
+        });
+
+    } else if (event == QLatin1String("checkConnectivity")) {
+
+        QDBusMessage msg = QDBusMessage::createMethodCall(s_networkManagerServiceName,
+                                                          s_networkManagerObjectPath,
+                                                          s_networkManagerInterface,
+                                                          QStringLiteral("CheckConnectivity"));
+
+        QDBusPendingReply<uint> reply = QDBusConnection::systemBus().asyncCall(msg);
+        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
+        connect(watcher, &QDBusPendingCallWatcher::finished, this, [this, serial](QDBusPendingCallWatcher *watcher) {
+            QDBusPendingReply<uint> reply = *watcher;
+            watcher->deleteLater();
+
+            if (reply.isError()) {
+                sendReply(serial, {
+                    {QStringLiteral("connectivity"), QStringLiteral("ERROR")}
+                });
+                return;
+            }
+
+            sendReply(serial, {
+                {QStringLiteral("connectivity"), connectivityString(reply.value())}
+            });
+        });
+
+    }
+
+    return {};
+}
+
+QString CaptivePortalPlugin::connectivityString(uint connectivity)
+{
+    switch (connectivity) {
+    case 1:
+        return QStringLiteral("NONE");
+    case 2:
+        return QStringLiteral("PORTAL");
+    case 3:
+        return QStringLiteral("LIMITED");
+    case 4:
+        return QStringLiteral("FULL");
+    }
+
+    return QStringLiteral("UNKNOWN");
+}
diff --git a/host/main.cpp b/host/main.cpp
--- a/host/main.cpp
+++ b/host/main.cpp
@@ -37,6 +37,7 @@
 #include "tabsrunnerplugin.h"
 #include "mprisplugin.h"
 #include "purposeplugin.h"
+#include "captiveportalplugin.h"
 
 void msgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
@@ -83,6 +84,7 @@
     PluginManager::self().addPlugin(new TabsRunnerPlugin(&a));
     PluginManager::self().addPlugin(new MPrisPlugin(&a));
     PluginManager::self().addPlugin(new PurposePlugin(&a));
+    PluginManager::self().addPlugin(new CaptivePortalPlugin(&a));
 
     // TODO make this prettier, also prevent unloading them at any cost
     PluginManager::self().loadPlugin(&Settings::self());