Partially fixed. Focus lost only on returning from Settings.