diff --git a/src/web/app/common/tags/twitter-setting.tag b/src/web/app/common/tags/twitter-setting.tag
index 5160350456..ae4c054505 100644
--- a/src/web/app/common/tags/twitter-setting.tag
+++ b/src/web/app/common/tags/twitter-setting.tag
@@ -2,7 +2,7 @@
 	<p>%i18n:common.tags.mk-twitter-setting.description%<a href={ CONFIG.aboutUrl + '/link-to-twitter' } target="_blank">%i18n:common.tags.mk-twitter-setting.detail%</a></p>
 	<p class="account" if={ I.twitter } title={ 'Twitter ID: ' + I.twitter.user_id }>%i18n:common.tags.mk-twitter-setting.connected-to%: <a href={ 'https://twitter.com/' + I.twitter.screen_name } target="_blank">@{ I.twitter.screen_name }</a></p>
 	<p>
-		<a href={ CONFIG.apiUrl + '/connect/twitter' } target="_blank">{ I.twitter ? '%i18n:common.tags.mk-twitter-setting.reconnect%' : '%i18n:common.tags.mk-twitter-setting.connect%' }</a>
+		<a href={ CONFIG.apiUrl + '/connect/twitter' } target="_blank" onclick={ authorize }>{ I.twitter ? '%i18n:common.tags.mk-twitter-setting.reconnect%' : '%i18n:common.tags.mk-twitter-setting.connect%' }</a>
 		<span if={ I.twitter }> or </span>
 		<a href={ CONFIG.apiUrl + '/disconnect/twitter' } target="_blank" if={ I.twitter }>%i18n:common.tags.mk-twitter-setting.disconnect%</a>
 	</p>
@@ -26,5 +26,28 @@
 	</style>
 	<script>
 		this.mixin('i');
+
+		this.form = null;
+
+		this.on('mount', () => {
+			this.I.on('updated', this.onMeUpdated);
+		});
+
+		this.on('mount', () => {
+			this.I.off('updated', this.onMeUpdated);
+		});
+
+		this.onMeUpdated = () => {
+			if (this.I.twitter) {
+				if (this.form) this.form.close();
+			}
+		};
+
+		this.authorize = () => {
+			this.form = window.open(CONFIG.apiUrl + '/connect/twitter',
+				'twitter_authorize_window',
+				'height=570,width=520');
+			return false;
+		};
 	</script>
 </mk-twitter-setting>