Re #431 Implemening the one click open/close behaviour.