diff --git a/models/workspace/workspace_mongo_accessor.go b/models/workspace/workspace_mongo_accessor.go
index 4a5fbbe..8dcd4ba 100644
--- a/models/workspace/workspace_mongo_accessor.go
+++ b/models/workspace/workspace_mongo_accessor.go
@@ -47,7 +47,12 @@ func (wfa *workspaceMongoAccessor) UpdateOne(set utils.DBObject, id string) (uti
 }
 
 func (wfa *workspaceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
-	res, _, err := wfa.Search(nil, data.GetName())
+	filters := &dbs.Filters{
+		Or: map[string][]dbs.Filter{
+			"abstractobject.name": {{dbs.LIKE.String(), data.GetName() + "_workspace"}},
+		},
+	}
+	res, _, err := wfa.Search(filters, "")
 	if err == nil && len(res) > 0 {
 		return nil, 409, errors.New("A workspace with the same name already exists")
 	}