diff --git a/shortcuts/apps/plugin_install.go b/shortcuts/apps/apps_plugin_install.go
similarity index 100%
rename from shortcuts/apps/plugin_install.go
rename to shortcuts/apps/apps_plugin_install.go
diff --git a/shortcuts/apps/plugin_install_test.go b/shortcuts/apps/apps_plugin_install_test.go
similarity index 100%
rename from shortcuts/apps/plugin_install_test.go
rename to shortcuts/apps/apps_plugin_install_test.go
diff --git a/shortcuts/apps/plugin_list.go b/shortcuts/apps/apps_plugin_list.go
similarity index 100%
rename from shortcuts/apps/plugin_list.go
rename to shortcuts/apps/apps_plugin_list.go
diff --git a/shortcuts/apps/plugin_list_test.go b/shortcuts/apps/apps_plugin_list_test.go
similarity index 100%
rename from shortcuts/apps/plugin_list_test.go
rename to shortcuts/apps/apps_plugin_list_test.go
diff --git a/shortcuts/apps/plugin_uninstall.go b/shortcuts/apps/apps_plugin_uninstall.go
similarity index 100%
rename from shortcuts/apps/plugin_uninstall.go
rename to shortcuts/apps/apps_plugin_uninstall.go
diff --git a/shortcuts/apps/plugin_uninstall_test.go b/shortcuts/apps/apps_plugin_uninstall_test.go
similarity index 100%
rename from shortcuts/apps/plugin_uninstall_test.go
rename to shortcuts/apps/apps_plugin_uninstall_test.go
diff --git a/shortcuts/apps/plugin_common.go b/shortcuts/apps/plugin_common.go
index 849fa7f94..d191ed27a 100644
--- a/shortcuts/apps/plugin_common.go
+++ b/shortcuts/apps/plugin_common.go
@@ -373,10 +373,14 @@ func pluginExtractTGZ(r io.Reader, destDir string) error {
 				return err
 			}
 			if _, err := io.Copy(f, tr); err != nil { //nolint:gosec // bounded by tar entry size
-				f.Close()
+				if cerr := f.Close(); cerr != nil {
+					return fmt.Errorf("copy tar entry: %w; close file: %v", err, cerr)
+				}
+				return err
+			}
+			if err := f.Close(); err != nil {
 				return err
 			}
-			f.Close()
 		}
 	}
 	return nil