diff --git a/src/client/app/common/scripts/room/room.ts b/src/client/app/common/scripts/room/room.ts
index b2e2c300b..1b5a2cbb1 100644
--- a/src/client/app/common/scripts/room/room.ts
+++ b/src/client/app/common/scripts/room/room.ts
@@ -646,6 +646,7 @@ export class Room {
 
 	@autobind
 	public removeFurniture() {
+		this.exitTransformMode();
 		const obj = this.selectedObject;
 		this.scene.remove(obj);
 		this.objects = this.objects.filter(object => object.name !== obj.name);
diff --git a/src/client/app/common/views/pages/room/room.vue b/src/client/app/common/views/pages/room/room.vue
index 955e35701..43e99a54e 100644
--- a/src/client/app/common/views/pages/room/room.vue
+++ b/src/client/app/common/views/pages/room/room.vue
@@ -136,6 +136,8 @@ export default Vue.extend({
 		},
 
 		remove() {
+			this.isTranslateMode = false;
+			this.isRotateMode = false;
 			room.removeFurniture();
 		},