diff --git a/cvat/apps/engine/static/engine/js/shapeCreator.js b/cvat/apps/engine/static/engine/js/shapeCreator.js
index e688476244c9..70ad3ed52dea 100644
--- a/cvat/apps/engine/static/engine/js/shapeCreator.js
+++ b/cvat/apps/engine/static/engine/js/shapeCreator.js
@@ -211,12 +211,17 @@ class ShapeCreatorView {
this._labelSelector.attr('title', `
${shortkeys['change_default_label'].view_value} - ${shortkeys['change_default_label'].description}`);
- let labels = window.cvat.labelsInfo.labels();
- for (let labelId in labels) {
- let option = $(``);
- option.appendTo(this._labelSelector);
+ const labels = window.cvat.labelsInfo.labels();
+ const labelsKeys = Object.keys(labels);
+ for (let i = 0; i < labelsKeys.length; i += 1) {
+ this._labelSelector.append(
+ // eslint-disable-next-line
+ $(``)
+ );
}
+ this._labelSelector.val(labelsKeys[0]);
+ this._typeSelector.val('box');
this._typeSelector.on('change', (e) => {
// FIXME: In the future we have to make some generic solution
const mode = this._modeSelector.prop('value');
diff --git a/cvat/apps/engine/templates/engine/annotation.html b/cvat/apps/engine/templates/engine/annotation.html
index 521a5d2d394e..c8ed37a61963 100644
--- a/cvat/apps/engine/templates/engine/annotation.html
+++ b/cvat/apps/engine/templates/engine/annotation.html
@@ -429,7 +429,7 @@