    * Listen for any `clientSubscribe` events that we care about.
    * Currently just `openFiles`, which triggers the IDE to open
    * a new file.
+   *
+   * @param {Machine} machine
   ###
-  bindKlientEvents: ->
-
-    @once 'MachineDidMount', (machine) =>
+  bindKlientEvents: (machine) ->
+
+    kite = machine.getBaseKite()
+    kite.ready =>
       kem = new KlientEventManager {}, machine
       kem.on 'openFiles', ({ eventName, files }) =>
 


    @createInitialView withFakeViews
    @bindCollapseEvents()
    @bindKlientEvents()

    {@finderPane, @settingsPane} = @workspace.panel.getPaneByName 'filesPane'


    else
      finderController.reset()

    # when MachineStateModal calls this func, we need to rebind Klient.
    @bindKlientEvents machine
    machine.getBaseKite().fetchTerminalSessions()

    @fetchSnapshot (snapshot) =>
