Photoshop might be confused. Have you closed and restarted Photoshop? Try resetting the preferences as well, and see if the issues persist.
Hold down Command-Option-Shift (Mac) or Ctrl-Alt-Shift (Windows) when you launch Photoshop to reset its preferences.
Of course, save your work before you do this.