diff --git a/data/ui/remotes.blp b/data/ui/remotes.blp
index d50b62b..5362b8c 100644
--- a/data/ui/remotes.blp
+++ b/data/ui/remotes.blp
@@ -24,7 +24,7 @@ template $RemotesWindow: Adw.Window {
             header-suffix: ToggleButton show_disabled_button {
               Adw.ButtonContent show_disabled_button_button_content {
                 icon-name: "eye-not-looking-symbolic";
-                label: _("Show disabled");
+                label: _("Show Disabled");
                 styles["flat"]
               }
               // spacing: 6;
diff --git a/po/warehouse.pot b/po/warehouse.pot
index c2a1960..751efbf 100644
--- a/po/warehouse.pot
+++ b/po/warehouse.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.flattool.heliguy.Warehouse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-05 01:05-0500\n"
+"POT-Creation-Date: 2024-01-20 00:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,6 @@ msgstr ""
 
 #. Translators: Do not translate the applicaion name
 #: data/io.github.flattool.Warehouse.desktop.in:4
-#: data/io.github.flattool.Warehouse.metainfo.xml.in:5
 msgid "Warehouse"
 msgstr ""
 
@@ -32,10 +31,6 @@ msgstr ""
 msgid "Manage all things Flatpak"
 msgstr ""
 
-#: data/io.github.flattool.Warehouse.metainfo.xml.in:6
-msgid "Heliguy"
-msgstr ""
-
 #: data/io.github.flattool.Warehouse.metainfo.xml.in:11
 msgid ""
 "Warehouse is an app that manages installed Flatpaks, their user data, and "
@@ -72,9 +67,9 @@ msgstr ""
 
 #: data/ui/downgrade.blp:16 data/ui/filter.blp:17 data/ui/search_install.blp:17
 #: src/orphans_window.py:121 src/orphans_window.py:189
-#: src/properties_window.py:147 src/remotes_window.py:85
-#: src/remotes_window.py:166 src/remotes_window.py:442
-#: src/remotes_window.py:614 src/snapshots_window.py:129
+#: src/properties_window.py:147 src/remotes_window.py:90
+#: src/remotes_window.py:171 src/remotes_window.py:450
+#: src/remotes_window.py:622 src/snapshots_window.py:129
 #: src/snapshots_window.py:239 src/window.py:232 src/window.py:306
 #: src/window.py:388 src/window.py:434 src/window.py:532 src/window.py:609
 #: src/window.py:785
@@ -85,15 +80,24 @@ msgstr ""
 msgid "Downgrade"
 msgstr ""
 
-#: data/ui/downgrade.blp:46 src/app_row_widget.py:261 src/window.py:436
+#: data/ui/downgrade.blp:49
+msgid "Fetching Releases…"
+msgstr ""
+
+#: data/ui/downgrade.blp:57 data/ui/orphans.blp:90 data/ui/window.blp:113
+#: data/ui/window.blp:140 data/ui/window.blp:167
+msgid "This could take a while."
+msgstr ""
+
+#: data/ui/downgrade.blp:65 src/app_row_widget.py:261 src/window.py:436
 msgid "Disable Updates"
 msgstr ""
 
-#: data/ui/downgrade.blp:52
+#: data/ui/downgrade.blp:71
 msgid "Select a Release"
 msgstr ""
 
-#: data/ui/downgrade.blp:53
+#: data/ui/downgrade.blp:72
 msgid ""
 "This will uninstall the current release and install the chosen one instead. "
 "Note that downgrading can cause issues."
@@ -135,11 +139,6 @@ msgstr ""
 msgid "Installing…"
 msgstr ""
 
-#: data/ui/orphans.blp:90 data/ui/window.blp:113 data/ui/window.blp:140
-#: data/ui/window.blp:167
-msgid "This could take a while."
-msgstr ""
-
 #: data/ui/orphans.blp:101
 msgid "No Leftover Data"
 msgstr ""
@@ -223,7 +222,7 @@ msgid "Installed Remotes"
 msgstr ""
 
 #: data/ui/remotes.blp:27
-msgid "Show disabled"
+msgid "Show Disabled"
 msgstr ""
 
 #: data/ui/remotes.blp:41
@@ -486,43 +485,39 @@ msgstr ""
 msgid "Manage Snapshots"
 msgstr ""
 
-#: src/downgrade_window.py:103
+#: src/downgrade_window.py:99
 msgid "Commit Hash: {}"
 msgstr ""
 
-#: src/downgrade_window.py:127
+#: src/downgrade_window.py:119
 msgid "Could not downgrade {}"
 msgstr ""
 
-#: src/downgrade_window.py:135 src/window.py:405
+#: src/downgrade_window.py:129 src/window.py:405
 msgid "Could not disable updates for {}"
 msgstr ""
 
-#: src/downgrade_window.py:148
+#: src/downgrade_window.py:142
 msgid "Downgrading…"
 msgstr ""
 
-#: src/downgrade_window.py:174
+#: src/downgrade_window.py:166
 msgid "Downgrade {}"
 msgstr ""
 
-#: src/downgrade_window.py:186
-msgid "Fetching Releases…"
-msgstr ""
-
-#: src/downgrade_window.py:189
+#: src/downgrade_window.py:179
 msgid "Ensure that {} will never be updated to a newer version"
 msgstr ""
 
-#: src/filter_window.py:126 src/orphans_window.py:150 src/remotes_window.py:300
+#: src/filter_window.py:126 src/orphans_window.py:150 src/remotes_window.py:307
 msgid "User wide"
 msgstr ""
 
-#: src/filter_window.py:128 src/orphans_window.py:152 src/remotes_window.py:302
+#: src/filter_window.py:128 src/orphans_window.py:152 src/remotes_window.py:309
 msgid "System wide"
 msgstr ""
 
-#: src/filter_window.py:130 src/orphans_window.py:154 src/remotes_window.py:304
+#: src/filter_window.py:130 src/orphans_window.py:154 src/remotes_window.py:311
 msgid "Unknown install type"
 msgstr ""
 
@@ -616,7 +611,7 @@ msgstr ""
 msgid "Could not manage data"
 msgstr ""
 
-#: src/properties_window.py:37 src/remotes_window.py:209
+#: src/properties_window.py:37 src/remotes_window.py:214
 msgid "Copied {}"
 msgstr ""
 
@@ -632,8 +627,8 @@ msgstr ""
 msgid "No User Data"
 msgstr ""
 
-#: src/properties_window.py:85 src/remotes_window.py:498
-#: src/remotes_window.py:623
+#: src/properties_window.py:85 src/remotes_window.py:506
+#: src/remotes_window.py:631
 msgid "Name"
 msgstr ""
 
@@ -705,127 +700,127 @@ msgstr ""
 msgid "{} Properties"
 msgstr ""
 
-#: src/remotes_window.py:71
+#: src/remotes_window.py:75
 msgid "Could not remove {}"
 msgstr ""
 
-#: src/remotes_window.py:80 src/remotes_window.py:161
+#: src/remotes_window.py:85 src/remotes_window.py:166
 msgid "Any installed apps from {} will stop receiving updates"
 msgstr ""
 
-#: src/remotes_window.py:83
+#: src/remotes_window.py:88
 msgid "Remove {}?"
 msgstr ""
 
-#: src/remotes_window.py:86 src/remotes_window.py:266
+#: src/remotes_window.py:91 src/remotes_window.py:272
 msgid "Remove"
 msgstr ""
 
-#: src/remotes_window.py:113
+#: src/remotes_window.py:118
 msgid "Could not enable {}"
 msgstr ""
 
-#: src/remotes_window.py:141
+#: src/remotes_window.py:146
 msgid "Could not disable {}"
 msgstr ""
 
-#: src/remotes_window.py:164
+#: src/remotes_window.py:169
 msgid "Disable {}?"
 msgstr ""
 
-#: src/remotes_window.py:167 src/remotes_window.py:257
+#: src/remotes_window.py:172 src/remotes_window.py:263
 msgid "Disable"
 msgstr ""
 
-#: src/remotes_window.py:178
+#: src/remotes_window.py:183
 msgid "Could not view apps"
 msgstr ""
 
-#: src/remotes_window.py:234
+#: src/remotes_window.py:240
 msgid "Set Filter"
 msgstr ""
 
-#: src/remotes_window.py:248
+#: src/remotes_window.py:254
 msgid "Enable"
 msgstr ""
 
-#: src/remotes_window.py:282
+#: src/remotes_window.py:288
 msgid "Copy remote name"
 msgstr ""
 
-#: src/remotes_window.py:295
+#: src/remotes_window.py:302
 msgid "Disabled"
 msgstr ""
 
-#: src/remotes_window.py:331
+#: src/remotes_window.py:339
 msgid "The open source, pay-what-you-want app store from elementary"
 msgstr ""
 
-#: src/remotes_window.py:337
+#: src/remotes_window.py:345
 msgid "Central repository of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:343
+#: src/remotes_window.py:351
 msgid "Beta builds of Flatpak applications"
 msgstr ""
 
-#: src/remotes_window.py:349
+#: src/remotes_window.py:357
 msgid "Flatpaks packaged by Fedora Linux"
 msgstr ""
 
-#: src/remotes_window.py:355
+#: src/remotes_window.py:363
 msgid "The latest beta GNOME Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:361
+#: src/remotes_window.py:369
 msgid "Beta KDE Apps and Runtimes"
 msgstr ""
 
-#: src/remotes_window.py:367
+#: src/remotes_window.py:375
 msgid "Central repository of the WebKit Developer and Runtime SDK"
 msgstr ""
 
-#: src/remotes_window.py:403 src/remotes_window.py:566
+#: src/remotes_window.py:411 src/remotes_window.py:574
 msgid "Could not add {}"
 msgstr ""
 
-#: src/remotes_window.py:440
+#: src/remotes_window.py:448
 msgid "Add Flatpak Remote"
 msgstr ""
 
-#: src/remotes_window.py:443 src/remotes_window.py:615
+#: src/remotes_window.py:451 src/remotes_window.py:623
 msgid "Add"
 msgstr ""
 
-#: src/remotes_window.py:502
+#: src/remotes_window.py:510
 msgid "URL"
 msgstr ""
 
-#: src/remotes_window.py:514 src/remotes_window.py:626 src/window.py:794
+#: src/remotes_window.py:522 src/remotes_window.py:634 src/window.py:794
 msgid "User"
 msgstr ""
 
-#: src/remotes_window.py:514 src/remotes_window.py:626
+#: src/remotes_window.py:522 src/remotes_window.py:634
 msgid "Remote will be available to only you"
 msgstr ""
 
-#: src/remotes_window.py:522 src/remotes_window.py:629 src/window.py:797
+#: src/remotes_window.py:530 src/remotes_window.py:637 src/window.py:797
 msgid "System"
 msgstr ""
 
-#: src/remotes_window.py:523 src/remotes_window.py:630
+#: src/remotes_window.py:531 src/remotes_window.py:638
 msgid "Remote will be available to every user on the system"
 msgstr ""
 
-#: src/remotes_window.py:562
+#: src/remotes_window.py:570
 msgid "{} successfully added"
 msgstr ""
 
-#: src/remotes_window.py:612
+#: src/remotes_window.py:620
 msgid "Add {}?"
 msgstr ""
 
-#: src/remotes_window.py:660
+#: src/remotes_window.py:668
 msgid "Flatpak Repos"
 msgstr ""
 
diff --git a/src/remotes_window.py b/src/remotes_window.py
index b2f736a..8b9d5a7 100644
--- a/src/remotes_window.py
+++ b/src/remotes_window.py
@@ -215,6 +215,7 @@ class RemotesWindow(Adw.Window):
 
         self.no_remotes.set_visible(True)
 
+        has_disabled = False
         for i in range(len(self.host_remotes)):
             try:
                 name = self.host_remotes[i][0]
@@ -294,6 +295,7 @@ class RemotesWindow(Adw.Window):
 
                 install_type = self.my_utils.get_install_type(install_type)
                 if install_type == "disabled":
+                    has_disabled = True
                     if not self.show_disabled_button.get_active():
                         continue
 
@@ -320,6 +322,7 @@ class RemotesWindow(Adw.Window):
                     "error in remotes_window.generate_list: could not add remote. error:",
                     e,
                 )
+        self.show_disabled_button.set_visible(has_disabled)
 
         # Popular remotes
         for i in range(len(self.rows_in_popular_list)):