diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index cd6e24f65b..d79b15ae66 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -14,6 +14,10 @@
 
 - https://github.com/eclipse-sirius/sirius-components/issues/1377[#1377] [core] Switch to Java 17
 
+=== Bug fixes
+
+https://github.com/eclipse-sirius/sirius-components/issues/1580[#1580] [diagram] Border nodes do not return to their previous position after they have been moved manually
+
 === New Features
 
 - https://github.com/eclipse-sirius/sirius-components/issues/1567[#1567] [project] Add support for project templates
diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/common/isSiriusModelElementRequest.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/common/isSiriusModelElementRequest.ts
index 52b93f1770..4958c12a40 100644
--- a/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/common/isSiriusModelElementRequest.ts
+++ b/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/common/isSiriusModelElementRequest.ts
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 Obeo.
+ * Copyright (c) 2022, 2023 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -14,7 +14,7 @@ import { decorate, inject } from 'inversify';
 import { CommandExecutionContext, SModelElement, SModelRoot, TYPES } from 'sprotty';
 import { generateRequestId, RequestAction, ResponseAction } from 'sprotty-protocol';
 import { ModelRequestCommand } from 'sprotty/lib/base/commands/request-command';
-import { Edge, Node } from '../Diagram.types';
+import { BorderNode, Edge, Node } from '../Diagram.types';
 
 export interface IsSiriusModelElementAction extends RequestAction<IsSiriusModelElementResult> {
   kind: typeof IsSiriusModelElementAction.KIND;
@@ -71,5 +71,5 @@ export class IsSiriusModelElementCommand extends ModelRequestCommand {
 decorate(inject(TYPES.Action) as ParameterDecorator, IsSiriusModelElementCommand, 0);
 
 export const isSiriusModelElement = (element: SModelElement): boolean => {
-  return element instanceof Node || element instanceof Edge;
+  return element instanceof Node || element instanceof BorderNode || element instanceof Edge;
 };