diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp
index 2608a79e6..fa9899193 100644
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@ -83,7 +83,6 @@ int main(int argc, char** argv)
     parser.addOption(deviceAutocomplete);
     about.setupCommandLine(&parser);
 
-    parser.addHelpOption();
     parser.process(app);
     about.processCommandLine(&parser);
 
@@ -167,7 +166,7 @@ int main(int argc, char** argv)
         }
 
         //Exit with 1 if we didn't find a device
-        return int(!devices.isEmpty());
+        return int(devices.isEmpty());
     } else if(parser.isSet(QStringLiteral("refresh"))) {
         QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect"), QStringLiteral("/modules/kdeconnect"), QStringLiteral("org.kde.kdeconnect.daemon"), QStringLiteral("forceOnNetworkChange"));
         blockOnReply(DBusHelper::sessionBus().asyncCall(msg));
diff --git a/cli/kdeconnect.zsh b/cli/kdeconnect.zsh
index ef76d218d..15ae27cee 100644
--- a/cli/kdeconnect.zsh
+++ b/cli/kdeconnect.zsh
@@ -17,6 +17,7 @@ _kdeconnect_device-ids() {
 local blockoperations="(operation sms)"
 _arguments -s \
   '(-)'{-h,--help}'[display usage information]' \
+  '(-)--help-all[display usage information, including Qt specific options]' \
   + '(global)' \
   $blockoperations{-l,--list-devices}'[list all devices]' \
   $blockoperations{-a,--list-available}'[list available (paired and reachable) devices]' \