The Gambling Motivation Scale (GMS), a scale based on self-determination theory, consists of seven motivations: to learn the game, to feel competent, to experience excitement, to socialize, to feel important, to win money, and to continue gambling aimlessly (Chantal, Vallerand, & Vallieres, 1994). The GMS has never been tested with confirmatory factor analysis to determine the appropriate structure of gambling motivation. In the present study, we developed the Modified Gambling Motivation Scale (MGMS) to improve the reading comprehension and psychometrics of the GMS. We also proposed a simpler interpretation of motivation scores than that applied to the previous scoring system. Confirmatory factor analysis, structural equation modelling, and measurement invariance were performed on the GMS and the MGMS, which suggested that six motivations were distinct and important to gambling behaviour: to experience an intellectual challenge (combined motivations to learn and to feel competent), to experience excitement, to socialize, to feel important, to win money, and to continue gambling aimlessly. This six-factor structure of gambling motivation aligns more closely with self-determination theory and removes problems with estimations in the seven-factor structure. The results showed that gamblers who were motivated to experience excitement and to socialize had more problem gambling than did other gamblers.