Image preview multiple issues

• No initial preview of selected file

When image preview function is invoked either using keyboard shortcut or via the option in the menu and a viable image is already selected beforehand, image preview isn't displayed. Instead 'No available thumbnail...' is displayed in the Image preview: Standalone mode and a symbol is displayed in Image preview: Embedded mode. Image previews in both modes work correctly only after a new file selection is being made.

• Wrong file is being previewed

If the image preview is toggled off while it was previewing file X and user selects file Y during that time, toggling it back on will display preview for file X instead of file Y.

I intuit both of these issues stem from the same origin (that being: file selection isn't being considered when initiating the image preview).