diff --git a/app/commands/remove.go b/app/commands/remove.go
index 2f26219d3b3db3143f598b18603c47fd3e53b052..b9fc57f7f50a51de97299b467a78e48ef2d0f5b2 100644
--- a/app/commands/remove.go
+++ b/app/commands/remove.go
@@ -22,7 +22,7 @@ func (cmd *RemoveCmd) Run(*Context) (err error) {
 	}
 	registry.Update()
 
-	fileName, ok := cmd.lookupFileName(registry)
+	fileName, ok := registry.Lookup(cmd.Id)
 	if !ok {
 		fileName = cmd.Id
 	}
@@ -50,16 +50,6 @@ func (cmd *RemoveCmd) Run(*Context) (err error) {
 	return err
 }
 
-func (cmd *RemoveCmd) lookupFileName(registry *utils.Registry) (string, bool) {
-	for fileName, entry := range registry.Entries {
-		if entry.Id == cmd.Id {
-			return fileName, true
-		}
-	}
-
-	return "", false
-}
-
 func uninstallAppImage(filePath string) error {
 	lib, err := dl.Open("libappimage.so", 0)
 	if err != nil {
diff --git a/app/utils/registry.go b/app/utils/registry.go
index 8687a83cb2d5e664d991fe2d0010cb4337f4c679..5dc474150fc1d0c2e273c4a4b04618f34239a0da 100644
--- a/app/utils/registry.go
+++ b/app/utils/registry.go
@@ -111,6 +111,16 @@ func (registry *Registry) Update() {
 	}
 }
 
+func (registry *Registry) Lookup(id string) (string, bool) {
+	for fileName, entry := range registry.Entries {
+		if entry.Id == id {
+			return fileName, true
+		}
+	}
+
+	return "", false
+}
+
 func getFileSha1Checksum(fileName string) (string, error) {
 	applicationsDir, err := MakeApplicationsDirPath()
 	if err != nil {