Fix morphine warning
Potentially fix menu not reopening after treatment

(#1645)