Non-alcoholic fatty liver disease (NAFLD), one of the most common causes of liver disease, is an increasingly common cause of hepatocellular carcinoma (HCC). Several demographic, clinical, and genetic factors contribute to HCC risk in NAFLD patients, which may inform risk stratification scores. Proven efficacious approaches to primary prevention approach in patients with non-viral liver disease remain an area of need. Semi-annual surveillance is associated with improved early tumor detection and reduced HCC-related mortality; however, patients with NAFLD have several challenges to effective surveillance, including under-recognition of at-risk patients, low surveillance utilization in clinical practice, and lower sensitivity of current tools for early-stage HCC detection. Treatment decisions are best made in a multidisciplinary fashion and are informed by several factors including tumor burden, liver dysfunction, performance status, and patient preferences. Although patients with NAFLD often have larger tumor burden and increased comorbidities compared to counterparts, they can achieve similar post-treatment survival with careful patient selection. Therefore, surgical therapies continue to provide a curative treatment option for patients diagnosed at an early stage. Although there has been debate about the efficacy of immune checkpoint inhibitors in patients with NAFLD, current data are insufficient to change treatment selection based on liver disease etiology.