diff --git a/dev/Common/Plugins.js b/dev/Common/Plugins.js
index 5021e7a48..4f32969a2 100644
--- a/dev/Common/Plugins.js
+++ b/dev/Common/Plugins.js
@@ -56,5 +56,4 @@ rl.pluginSettingsGet = (pluginSection, name) => {
 	return plugins ? (null == plugins[name] ? null : plugins[name]) : null;
 };
 
-rl.showPluginPopup = showScreenPopup;
 rl.pluginPopupView = AbstractViewPopup;
diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index a501e26cb..442876a71 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -3,8 +3,7 @@ import ko from 'ko';
 import { inFocus, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'Common/Utils';
 import { Scope } from 'Common/Enums';
 import { keyScope, Settings, leftPanelDisabled } from 'Common/Globals';
-import { ViewType } from 'Knoin/Knoin';
-//import { showScreenPopup } from 'Knoin/Knoin';
+import { ViewType, showScreenPopup } from 'Knoin/Knoin';
 
 class AbstractView {
 	constructor(templateID, type)
@@ -88,11 +87,11 @@ export class AbstractViewPopup extends AbstractView
 		});
 	}
 }
-/*
-AbstractViewPopup.show = function(params = []) {
+
+AbstractViewPopup.showModal = function(params = []) {
 	showScreenPopup(this, params);
 }
-*/
+
 AbstractViewPopup.hidden = function() {
 	return !this.__vm || !this.__vm.modalVisibility();
 }
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index 15264a1c2..45fa32f83 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -244,10 +244,7 @@ const
 				}, 1);
 			}
 		}
-	},
-
-	getScreenPopupViewModel = ViewModelClassToShow =>
-		(buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom) && ViewModelClassToShow.__vm;
+	};
 
 
 export const
@@ -281,7 +278,8 @@ export const
 	 * @returns {void}
 	 */
 	showScreenPopup = (ViewModelClassToShow, params = []) => {
-		const vm = getScreenPopupViewModel(ViewModelClassToShow);
+		const vm = buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom && ViewModelClassToShow.__vm;
+
 		if (vm) {
 			params = params || [];
 
diff --git a/plugins/README.md b/plugins/README.md
index fe3475310..908250dca 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -5,6 +5,15 @@ class Plugin extends \RainLoop\Plugins\AbstractPlugin
 }
 ```
 
+JavaScript
+```javascript
+class PluginPopupView extends rl.pluginPopupView
+{
+}
+
+PluginPopupView.showModal();
+```
+
 # Hooks
 
 ```php
diff --git a/plugins/two-factor-auth/js/TwoFactorAuthSettings.js b/plugins/two-factor-auth/js/TwoFactorAuthSettings.js
index e25242d27..4c3b8e9a4 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthSettings.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthSettings.js
@@ -117,7 +117,7 @@ class TwoFactorAuthSettings
 	}
 
 	testTwoFactor() {
-		rl.showPluginPopup(TwoFactorAuthTestPopupView, [this.twoFactorTested]);
+		TwoFactorAuthTestPopupView.showModal([this.twoFactorTested]);
 	}
 
 	clearTwoFactor() {