 				case .open(let wspace):
 					self.openLocalSession(for: wspace.identifier)
 				case .remove(let wspace):
-					let client = Rc2RestClient(self.connectionManager.localConnection!)
+					let client = Rc2RestClient(self.connectionManager.currentConnection!)
 					client.remove(workspace: wspace).observe(on: UIScheduler()).startWithResult { result in
 						if let err = result.error {
 							self.appStatus?.presentError(err, session: nil)

	/// - Parameter menu: menu to update
	fileprivate func updateOpen(menu: NSMenu) {
		menu.removeAllItems()
		guard let projects = connectionManager.localConnection?.projects.value, projects.count > 0 else {
			return
		}
		guard projects.count > 1 else {

	}
	
	@IBAction func newWorkspace(_ sender: Any?) {
		guard let conInfo = connectionManager.currentConnection, let project = conInfo.defaultProject else { fatalError() }
		DispatchQueue.main.async {
			let existingNames = project.workspaces.value.map { $0.name.lowercased() }
			let prompter = InputPrompter(prompt: "Workspace name:", defaultValue: "new workspace")
