CMD+W should close tab, not window

When I press CMD+W I close the server window.

I would expect to close the tab - and maybe if all tabs are closed, the window.
(But for the window, I would like to see a modal window asking "Do you really want to close this window?")

ENTER on Find query field

When I enter a query and hit ENTER, I would expect that "run" will be executed.
At the moment nothing happens