diff --git a/Modules/Settings/Bar/BarWidgetSettingsDialog.qml b/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
index 4b35b7fd..bdab9808 100644
--- a/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
+++ b/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
@@ -133,6 +133,7 @@ Popup {
       "Spacer": "WidgetSettings/SpacerSettings.qml",
       "SystemMonitor": "WidgetSettings/SystemMonitorSettings.qml",
       "Volume": "WidgetSettings/VolumeSettings.qml",
+      "WiFi": "WidgetSettings/WiFiSettings.qml",
       "Workspace": "WidgetSettings/WorkspaceSettings.qml",
       "Taskbar": "WidgetSettings/TaskbarSettings.qml",
       "Tray": "WidgetSettings/TraySettings.qml"
diff --git a/Modules/Settings/Bar/WidgetSettings/WiFiSettings.qml b/Modules/Settings/Bar/WidgetSettings/WiFiSettings.qml
new file mode 100644
index 00000000..d6548476
--- /dev/null
+++ b/Modules/Settings/Bar/WidgetSettings/WiFiSettings.qml
@@ -0,0 +1,40 @@
+import QtQuick
+import QtQuick.Layouts
+import qs.Commons
+import qs.Widgets
+
+ColumnLayout {
+  id: root
+  spacing: Style.marginM
+
+  // Properties to receive data from parent
+  property var widgetData: null
+  property var widgetMetadata: null
+
+  // Local state
+  property string valueDisplayMode: widgetData.displayMode !== undefined ? widgetData.displayMode : widgetMetadata.displayMode
+
+  function saveSettings() {
+    var settings = Object.assign({}, widgetData || {})
+    settings.displayMode = valueDisplayMode
+    return settings
+  }
+
+  NComboBox {
+    label: I18n.tr("bar.widget-settings.battery.display-mode.label")
+    description: I18n.tr("bar.widget-settings.battery.display-mode.description")
+    minimumWidth: 134
+    model: [{
+        "key": "onhover",
+        "name": I18n.tr("options.display-mode.on-hover")
+      }, {
+        "key": "alwaysShow",
+        "name": I18n.tr("options.display-mode.always-show")
+      }, {
+        "key": "alwaysHide",
+        "name": I18n.tr("options.display-mode.always-hide")
+      }]
+    currentKey: root.valueDisplayMode
+    onSelected: key => root.valueDisplayMode = key
+  }
+}
diff --git a/Services/BarWidgetRegistry.qml b/Services/BarWidgetRegistry.qml
index a5823db6..6a0fcfe0 100644
--- a/Services/BarWidgetRegistry.qml
+++ b/Services/BarWidgetRegistry.qml
@@ -129,6 +129,10 @@ Singleton {
                                     "blacklist": [],
                                     "colorizeIcons": false
                                   },
+                                  "WiFi": {
+                                    "allowUserSettings": true,
+                                    "displayMode": "onhover"
+                                  },
                                   "Workspace": {
                                     "allowUserSettings": true,
                                     "labelMode": "index",