diff --git a/adb/adb.go b/adb/adb.go
index 726d546..3e4f5fc 100644
--- a/adb/adb.go
+++ b/adb/adb.go
@@ -79,12 +79,7 @@ func IsServerRunning() bool {
 }
 
 func StartServer() error {
-	cmd := exec.Command("adb", "start-server")
-	err := cmd.Run()
-	if err != nil {
-		return err
-	}
-	return cmd.Wait()
+	return exec.Command("adb", "start-server").Run()
 }
 
 type Device struct {
diff --git a/cmd/fdroidcl/devices.go b/cmd/fdroidcl/devices.go
index 2e7f40a..7fd2412 100644
--- a/cmd/fdroidcl/devices.go
+++ b/cmd/fdroidcl/devices.go
@@ -41,6 +41,7 @@ func startAdbIfNeeded() {
 }
 
 func maybeOneDevice() *adb.Device {
+	startAdbIfNeeded()
 	devices, err := adb.Devices()
 	if err != nil {
 		log.Fatalf("Could not get devices: %v", err)