This paper develops a new analysis of partial wh-movement in Indonesian, a construction which raises seemingly challenging problems for criterial freezing. It is proposed that partially-moving wh-phrases in Indonesian are structured as focused expressions properly containing a wh-interrogative phrase. It is argued that the derivation of partial wh-movement in Indonesian involves sub-extraction, or movement out of a moved element, to evade a freezing violation that would otherwise ensue. More specifically, it involves focus movement of the focused XP to the intermediate non-interrogative C-system, followed by sub-extraction of the QP from the XP to the matrix interrogative C-system. The analysis receives independent empirical support from the amelioration of freezing effects observed in focused wh-questions in Japanese.