@@ -55,10 +55,19 @@ export class FlutterDeviceManager implements vs.Disposable {
 		}
 	}
 
-	public deviceRemoved(dev: f.Device) {
+	public async deviceRemoved(dev: f.Device) {
 		this.devices = this.devices.filter((d) => d.id !== dev.id);
 		if (this.currentDevice && this.currentDevice.id === dev.id) {
-			this.currentDevice = this.devices.length === 0 ? undefined : this.devices[this.devices.length - 1];
+			this.currentDevice = undefined;
+
+			// Try to select the next-best device
+			if (this.devices.length) {
+				const supportedPlatforms = await this.getSupportedPlatformsForWorkspace();
+				const supportedDevices = this.devices.filter((d) => this.isSupported(supportedPlatforms, d));
+				if (supportedDevices && supportedDevices.length)
+					this.currentDevice = supportedDevices[0];
+			}
+
 			this.updateStatusBar();
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,19 @@ export class FlutterDeviceManager implements vs.Disposable {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- public deviceRemoved(dev: f.Device) {`
	`58`	`+ public async deviceRemoved(dev: f.Device) {`
`59`	`59`	`this.devices = this.devices.filter((d) => d.id !== dev.id);`
`60`	`60`	`if (this.currentDevice && this.currentDevice.id === dev.id) {`
`61`		`- this.currentDevice = this.devices.length === 0 ? undefined : this.devices[this.devices.length - 1];`
	`61`	`+ this.currentDevice = undefined;`
	`62`	`+`
	`63`	`+ // Try to select the next-best device`
	`64`	`+ if (this.devices.length) {`
	`65`	`+ const supportedPlatforms = await this.getSupportedPlatformsForWorkspace();`
	`66`	`+ const supportedDevices = this.devices.filter((d) => this.isSupported(supportedPlatforms, d));`
	`67`	`+ if (supportedDevices && supportedDevices.length)`
	`68`	`+ this.currentDevice = supportedDevices[0];`
	`69`	`+ }`
	`70`	`+`
`62`	`71`	`this.updateStatusBar();`
`63`	`72`	`}`
`64`	`73`	`}`