diff --git a/compose/repository/module.go b/compose/repository/module.go
index d196666ed..b2fea3d77 100644
--- a/compose/repository/module.go
+++ b/compose/repository/module.go
@@ -127,7 +127,7 @@ func (r module) Find(filter types.ModuleFilter) (set types.ModuleSet, f types.Mo
 		q := "%" + strings.ToLower(f.Query) + "%"
 		query = query.Where(squirrel.Or{
 			squirrel.Like{"LOWER(name)": q},
-			squirrel.Like{"LOWER(slug)": q},
+			squirrel.Like{"LOWER(handle)": q},
 		})
 	}
 
diff --git a/tests/compose/module_test.go b/tests/compose/module_test.go
index accb1dbb5..e6a58b4cf 100644
--- a/tests/compose/module_test.go
+++ b/tests/compose/module_test.go
@@ -19,9 +19,13 @@ func (h helper) repoModule() repository.ModuleRepository {
 }
 
 func (h helper) repoMakeModule(ns *types.Namespace, name string, ff ...*types.ModuleField) *types.Module {
+	return h.repoSaveModule(&types.Module{Name: name, NamespaceID: ns.ID, Fields: ff})
+}
+
+func (h helper) repoSaveModule(mod *types.Module) *types.Module {
 	m, err := h.
 		repoModule().
-		Create(&types.Module{Name: name, NamespaceID: ns.ID, Fields: ff})
+		Create(mod)
 	h.a.NoError(err)
 
 	err = h.repoModule().UpdateFields(m.ID, m.Fields, false)
@@ -81,6 +85,28 @@ func TestModuleList(t *testing.T) {
 		End()
 }
 
+func TestModuleListQuery(t *testing.T) {
+	h := newHelper(t)
+
+	h.allow(types.NamespacePermissionResource.AppendWildcard(), "read")
+	ns := h.repoMakeNamespace("some-namespace")
+
+	h.repoSaveModule(&types.Module{
+		Name:        "name",
+		Handle:      "handle",
+		NamespaceID: ns.ID,
+	})
+
+	h.apiInit().
+		Get(fmt.Sprintf("/namespace/%d/module/", ns.ID)).
+		Query("query", "handle").
+		Expect(t).
+		Status(http.StatusOK).
+		Assert(helpers.AssertNoErrors).
+		Assert(jsonpath.Present("$.response.set != null")).
+		End()
+}
+
 func TestModuleCreateForbidden(t *testing.T) {
 	h := newHelper(t)