diff --git a/gtweak/tweaks/tweak_group_desktop.py b/gtweak/tweaks/tweak_group_desktop.py
index 8b2284c..9877d2a 100644
--- a/gtweak/tweaks/tweak_group_desktop.py
+++ b/gtweak/tweaks/tweak_group_desktop.py
@@ -16,8 +16,16 @@
 # along with gnome-tweak-tool.  If not, see <http://www.gnu.org/licenses/>.
 
 from gtweak.widgets import ListBoxTweakGroup, GSettingsSwitchTweak, GSettingsComboEnumTweak, GSettingsFileChooserButtonTweak, Title
+from gtweak.gshellwrapper import GnomeShellFactory
+
+_shell = GnomeShellFactory().get_shell()
 
 dicons = GSettingsSwitchTweak(_("Show Icons"),"org.gnome.desktop.background","show-desktop-icons")
+if (_shell.mode == 'classic'):
+    dicons.switch.set_active(True)
+    dicons.switch.set_sensitive(False)
+else:
+    dicons.switch.set_sensitive(True)
 
 TWEAK_GROUPS = [
     ListBoxTweakGroup(_("Desktop"),
diff --git a/gtweak/widgets.py b/gtweak/widgets.py
index aa3f24f..670bb79 100644
--- a/gtweak/widgets.py
+++ b/gtweak/widgets.py
@@ -274,6 +274,7 @@ class GSettingsSwitchTweak(Gtk.Box, _GSettingsTweak, _DependableMixin):
 
         w = Gtk.Switch()
         self.settings.bind(key_name, w, "active", Gio.SettingsBindFlags.DEFAULT)
+        self.switch = w
 
         self.add_dependency_on_tweak(
                 options.get("depends_on"),
