Non-alcoholic fatty liver disease (NAFLD) is defined as the accumulation of intrahepatic fat which cannot be attributed to secondary causes such as alcohol or drugs. It encompasses a spectrum of disease from non-alcoholic fatty liver (NAFL) to non-alcoholic steatohepatitis (NASH), fibrosis and cirrhosis. NASH is characterized by the presence of hepatic inflammation and hepatocyte injury (ballooning) with or without fibrosis, and it is the progressive subtype that can lead to cirrhosis and hepatocellular carcinoma (HCC).1 NAFLD and type 2 diabetes (T2D) are very related diseases and frequently co-exist; in fact, the prevalence of NAFLD is increasing in parallel to obesity and T2D epidemics. Early detection of NAFLD patients at high-risk of liver disease progression, as well as management of T2D and other metabolic comorbidities have the potential to reduce the burden of cardiovascular and liver-related mortality. Therefore, a close collaboration between primary care physician, endocrinologists and hepatologists is essential to optimize the management of NAFLD patients. Here, we summarize relevant aspects about NAFLD and T2D that all clinician managing these patients should know as well as current therapeutic options for the treatment of T2D associated with NAFLD.