Ctrl+Alt+T fix

@fatihacet, @sinan - could you review this fix please?