diff --git a/src/main.rs b/src/main.rs
index 27f50e15..d9dfcfef 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -171,15 +171,15 @@ async fn main() -> Result<()> {
     cancellation_token.clone(),
   )));
 
-  if args.command.is_none() {
-    if let Some(name) = args.global.servarr_name.as_deref() {
-      let mut app = app.lock().await;
-      anyhow::ensure!(
-        app.server_tabs.select_tab_by_title(name.trim()),
-        "A Servarr titled '{}' was not found in your configuration file",
-        name.trim()
-      );
-    }
+  if args.command.is_none()
+    && let Some(name) = args.global.servarr_name.as_deref()
+  {
+    let mut app = app.lock().await;
+    anyhow::ensure!(
+      app.server_tabs.select_tab_by_title(name.trim()),
+      "A Servarr titled '{}' was not found in your configuration file",
+      name.trim()
+    );
   }
 
   match args.command {
diff --git a/tests/servarr_name_cli_integration_tests.rs b/tests/servarr_name_cli_integration_tests.rs
index 6226fb55..eb820160 100644
--- a/tests/servarr_name_cli_integration_tests.rs
+++ b/tests/servarr_name_cli_integration_tests.rs
@@ -247,12 +247,7 @@ fn no_servarr_name_uses_first_configured_instance() {
   let assertion = command
     .arg("--config-file")
     .arg(config.path())
-    .args([
-      "--disable-spinner",
-      "radarr",
-      "get",
-      "system-status",
-    ])
+    .args(["--disable-spinner", "radarr", "get", "system-status"])
     .assert()
     .success();
   let stdout = str::from_utf8(&assertion.get_output().stdout).unwrap();