diff --git a/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte b/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
index f25e5bf478..033191c900 100644
--- a/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
@@ -347,7 +347,7 @@
   }
 
   .content {
-    padding-left: 3.25rem;
+    padding: 0 3.25rem;
   }
 
   .bottomSpacing {
diff --git a/plugins/text-editor-resources/src/components/extension/table/TableNodeView.svelte b/plugins/text-editor-resources/src/components/extension/table/TableNodeView.svelte
index b4da3b4912..d577b32365 100644
--- a/plugins/text-editor-resources/src/components/extension/table/TableNodeView.svelte
+++ b/plugins/text-editor-resources/src/components/extension/table/TableNodeView.svelte
@@ -41,7 +41,7 @@
     const from = getPos()
     const to = from + node.nodeSize
 
-    focused = editor.state.selection.from <= to && editor.state.selection.to >= from
+    focused = editor.state.selection.from <= to && editor.state.selection.to >= from && editor.isActive('table')
   }
 
   function handleAddRow (evt: Event): void {
diff --git a/plugins/text-editor-resources/src/components/extension/table/TableToolbar.svelte b/plugins/text-editor-resources/src/components/extension/table/TableToolbar.svelte
index 406f778eda..4a82d1e081 100644
--- a/plugins/text-editor-resources/src/components/extension/table/TableToolbar.svelte
+++ b/plugins/text-editor-resources/src/components/extension/table/TableToolbar.svelte
@@ -50,7 +50,7 @@
     actions = out
   }
 
-  $: actionsQuery.query(textEditor.class.TextEditorAction, { kind: 'table' }, (result) => {
+  actionsQuery.query(textEditor.class.TextEditorAction, { kind: 'table' }, (result) => {
     void updateActions([...result], actionCtx)
   })