diff --git a/src/views/settings/settingFile.ts b/src/views/settings/settingFile.ts
index 5e96070..2caf6e9 100644
--- a/src/views/settings/settingFile.ts
+++ b/src/views/settings/settingFile.ts
@@ -15,6 +15,8 @@ export default class SettingFileTreeItem extends TreeItem implements GithubLocal
         this.contextValue = treeItem.contextValue;
         this.iconPath = treeItem.iconPath;
         this.checkboxState = settingFile.selected ? TreeItemCheckboxState.Checked : TreeItemCheckboxState.Unchecked;
+        this.tooltip = `Name: ${settingFile.name}\n` +
+            `Path: ${settingFile.path}\n`;
     }
 
     static getSecretTreeItem(workspaceFolder: WorkspaceFolder, secretFile: SettingFile): SettingFileTreeItem {
diff --git a/src/views/settings/settingsTreeDataProvider.ts b/src/views/settings/settingsTreeDataProvider.ts
index 90e3c9c..dfff2bf 100644
--- a/src/views/settings/settingsTreeDataProvider.ts
+++ b/src/views/settings/settingsTreeDataProvider.ts
@@ -41,7 +41,7 @@ export default class SettingsTreeDataProvider implements TreeDataProvider<Github
                             existingSettingFileNames.push(settingFileName);
                         } else {
                             const newSettingFile: SettingFile = {
-                                name: path.parse(uri.fsPath).name,
+                                name: path.parse(uri.fsPath).base,
                                 path: uri.fsPath,
                                 selected: false
                             };