Merge "Fix focus bug in Repository View"