A fishway entrance in the flood wall downstream of the Hadley Falls Hydroelectric Project spillway allows migrants moving upstream in the Connecticut River to access a fish lift approach channel. Attraction flow from this fishway entrance is provided to enhance fish passage, but flow over the spillway from the surface bypass weir and adjacent gate at the dam crest interferes with fish finding this entrance. This paper will discuss how computational fluid dynamics (CFD) was used to explore various options to modify the fishway entrance geometry and to effectively dissipate the energy of high velocity flows leaving the spillway apron near the fishway entrance. In particular, three options to improve fishway entrance flow conditions will be presented, including removal of the present entrance deflector wall, use of a fish-friendly turbine discharge, and adding a plunge pool in the spillway apron. For each option, the results of CFD simulations will be presented with an evaluation of the probable impact of flow patterns on upstream fish passage.