diff --git a/src/web/app/common/views/directives/focus.ts b/src/web/app/common/views/directives/focus.ts
new file mode 100644
index 0000000000..b4fbcb6a87
--- /dev/null
+++ b/src/web/app/common/views/directives/focus.ts
@@ -0,0 +1,5 @@
+export default {
+ inserted(el) {
+ el.focus();
+ }
+};
diff --git a/src/web/app/common/views/directives/index.ts b/src/web/app/common/views/directives/index.ts
new file mode 100644
index 0000000000..358866f500
--- /dev/null
+++ b/src/web/app/common/views/directives/index.ts
@@ -0,0 +1,5 @@
+import Vue from 'vue';
+
+import focus from './focus';
+
+Vue.directive('focus', focus);
diff --git a/src/web/app/desktop/-tags/post-form-window.tag b/src/web/app/desktop/-tags/post-form-window.tag
deleted file mode 100644
index 562621bde2..0000000000
--- a/src/web/app/desktop/-tags/post-form-window.tag
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
- %i18n:desktop.tags.mk-post-form-window.post%
- %i18n:desktop.tags.mk-post-form-window.reply%
- { '%i18n:desktop.tags.mk-post-form-window.attaches%'.replace('{}', parent.files.length) }
- { '%i18n:desktop.tags.mk-post-form-window.uploading-media%'.replace('{}', parent.uploadingFiles.length) }
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/web/app/desktop/views/components/post-form-window.vue b/src/web/app/desktop/views/components/post-form-window.vue
new file mode 100644
index 0000000000..37670ccd9e
--- /dev/null
+++ b/src/web/app/desktop/views/components/post-form-window.vue
@@ -0,0 +1,63 @@
+
+
+
+ %i18n:desktop.tags.mk-post-form-window.post%
+ %i18n:desktop.tags.mk-post-form-window.reply%
+ { '%i18n:desktop.tags.mk-post-form-window.attaches%'.replace('{}', parent.files.length) }
+ { '%i18n:desktop.tags.mk-post-form-window.uploading-media%'.replace('{}', parent.uploadingFiles.length) }
+
+
+
+
+
+
+
+
diff --git a/src/web/app/desktop/views/components/timeline-post.vue b/src/web/app/desktop/views/components/timeline-post.vue
index ed05967411..38f5f0891f 100644
--- a/src/web/app/desktop/views/components/timeline-post.vue
+++ b/src/web/app/desktop/views/components/timeline-post.vue
@@ -73,8 +73,7 @@