diff --git a/packages/tiptap/src/utils/Editor.js b/packages/tiptap/src/utils/Editor.js
index 42899ab6..05cc04c5 100644
--- a/packages/tiptap/src/utils/Editor.js
+++ b/packages/tiptap/src/utils/Editor.js
@@ -255,9 +255,8 @@ export default class Editor {
 
 	registerPlugin(plugin = null) {
 		if (plugin) {
-			this.plugins = this.plugins.concat([plugin])
 			this.state = this.state.reconfigure({
-				plugins: this.plugins,
+				plugins: this.state.plugins.concat([plugin]),
 			})
 			this.view.updateState(this.state)
 		}
diff --git a/packages/tiptap/src/utils/FloatingMenu.js b/packages/tiptap/src/utils/FloatingMenu.js
index b4f86f5a..bb3371d0 100644
--- a/packages/tiptap/src/utils/FloatingMenu.js
+++ b/packages/tiptap/src/utils/FloatingMenu.js
@@ -28,7 +28,7 @@ class Toolbar {
 
 		const isActive = currentDom.node.innerHTML === '<br>'
 			&& currentDom.node.tagName === 'P'
-			// && currentDom.node.parentNode === view.dom
+			&& currentDom.node.parentNode === view.dom
 
 		if (!isActive) {
 			this.hide()