Structural change is an important driver of productivity growth at the aggregate level. While previous productivity decompositions account for the contributions of market entry and exit, they overlook continuing firms that switch from one industry to another. We develop an improved productivity decomposition that accounts for both intra-industry and inter-industry switching, is applicable to both static and inter-temporal settings, and ensures consistent aggregation of firm-level productivity to the industry level. The proposed decomposition is applied to Finland’s information and communication technology (ICT) industry in the first two decades of the 21st century. This industry experienced major structural changes due to the rapid downfall of Nokia, the world’s largest mobile phone manufacturer at the beginning of our study period. Our results reveal that the sharp decline of labor productivity was associated with structural changes, whereas the surviving firms that continued in the same industry managed to improve their productivity. Our results indicate that industry switching can dampen or enhance the productivity impacts of structural change, especially during times of crisis and recession.