diff --git a/0001-status-network-Use-wwan-settings-panel-for-GSM-LTE-M.patch b/0001-status-network-Use-wwan-settings-panel-for-GSM-LTE-M.patch
new file mode 100644
index 0000000..b910c43
--- /dev/null
+++ b/0001-status-network-Use-wwan-settings-panel-for-GSM-LTE-M.patch
@@ -0,0 +1,58 @@
+From 7e94d682985ac4ff422da73b5878f4f005eff67b Mon Sep 17 00:00:00 2001
+From: Mohammed Sadiq <sadiq@sadiqpk.org>
+Date: Tue, 10 Aug 2021 15:22:30 +0530
+Subject: [PATCH] status/network: Use wwan settings panel for GSM/LTE Modems
+
+GSM/UMTS/LTE modems now have better support with wwan panel in GNOME
+Settings.  So, if the modem supports, open wwan panel, otherwise
+fallback to opening network panel when "Mobile Broadband Settings"
+item is clicked.
+
+See https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/583
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1942>
+---
+ js/ui/status/network.js | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index f510f90ae..fe82fcb08 100644
+--- a/js/ui/status/network.js
++++ b/js/ui/status/network.js
+@@ -543,7 +543,11 @@ var NMDeviceModem = class extends NMConnectionDevice {
+     constructor(client, device) {
+         super(client, device);
+ 
+-        this.item.menu.addSettingsAction(_("Mobile Broadband Settings"), 'gnome-network-panel.desktop');
++        const settingsPanel = this._useWwanPanel()
++            ? 'gnome-wwan-panel.desktop'
++            : 'gnome-network-panel.desktop';
++
++        this.item.menu.addSettingsAction(_('Mobile Broadband Settings'), settingsPanel);
+ 
+         this._mobileDevice = null;
+ 
+@@ -573,8 +577,19 @@ var NMDeviceModem = class extends NMConnectionDevice {
+         return NMConnectionCategory.WWAN;
+     }
+ 
++    _useWwanPanel() {
++        // Currently, wwan panel doesn't support CDMA_EVDO modems
++        const supportedCaps =
++            NM.DeviceModemCapabilities.GSM_UMTS |
++            NM.DeviceModemCapabilities.LTE;
++        return this._device.current_capabilities & supportedCaps;
++    }
++
+     _autoConnect() {
+-        launchSettingsPanel('network', 'connect-3g', this._device.get_path());
++        if (this._useWwanPanel())
++            launchSettingsPanel('wwan', 'show-device', this._device.udi);
++        else
++            launchSettingsPanel('network', 'connect-3g', this._device.get_path());
+     }
+ 
+     _sessionUpdated() {
+-- 
+2.31.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 8fd2a15..2c8c878 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        40.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -32,6 +32,7 @@ Patch35: fix-some-js-warnings.patch
 Patch36: 0001-st-texture-cache-purge-on-resume.patch
 Patch37: 0001-Update-generated-stylesheets.patch
 Patch38: add-power-profiles-menu.patch
+Patch39: 0001-status-network-Use-wwan-settings-panel-for-GSM-LTE-M.patch
 
 %define eds_version 3.33.1
 %define gnome_desktop_version 3.35.91
@@ -250,6 +251,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Thu Aug 19 2021 Florian Müllner <fmuellner@redhat.com> - 40.4-2
+- Use wwan setting panel for GSM/LTE modems
+  Resolves: #1995560
+
 * Wed Aug 18 2021 Florian Müllner <fmuellner@redhat.com> - 40.4-1
 - Update to 40.4
   Resolves: #1995094