Merge pull request #1547 from garthwilliamson/master

Don't try to open directories as files from sidebar