diff --git a/app/javascript/vue/results/results_toolbar.vue b/app/javascript/vue/results/results_toolbar.vue
index 4f413d18c..9a7d9f0c1 100644
--- a/app/javascript/vue/results/results_toolbar.vue
+++ b/app/javascript/vue/results/results_toolbar.vue
@@ -34,7 +34,7 @@
         </li>
       </ul>
     </div>
-    <div class="result-toolbar__right flex items-center" @click="$emit('expandAll')">
+    <div class="result-toolbar__right flex items-center">
       <button class="btn btn-secondary mr-3" @click="collapseResults" tabindex="0">
         {{ i18n.t('my_modules.results.collapse_label') }}
       </button>
diff --git a/app/javascript/vue/shared/content/text.vue b/app/javascript/vue/shared/content/text.vue
index b5652fbba..489651e50 100644
--- a/app/javascript/vue/shared/content/text.vue
+++ b/app/javascript/vue/shared/content/text.vue
@@ -48,7 +48,7 @@
         @editingDisabled="disableEditMode"
         @editingEnabled="enableEditMode"
       />
-      <div class="view-text-element" v-else-if="element.attributes.orderable.text_view" v-html="element.attributes.orderable.text_view"></div>
+      <div class="view-text-element" v-else-if="element.attributes.orderable.text_view" v-html="wrapTables"></div>
       <div v-else class="text-sn-grey">
         {{ i18n.t("protocols.steps.text.empty_text") }}
       </div>
@@ -112,6 +112,16 @@
       })
     },
     computed: {
+      wrapTables() {
+        const container = $(`<span>${this.element.attributes.orderable.text_view}</span>`);
+        container.find('table').toArray().forEach((table) => {
+          if ($(table).parent().hasClass('table-wrapper')) return;
+          $(table).css('float', 'none').wrapAll(`
+            <div class="table-wrapper" style="overflow: auto; width: 100%"></div>
+          `);
+        });
+        return container.prop('outerHTML');
+      },
       actionMenu() {
         let menu = [];
         if (this.element.attributes.orderable.urls.update_url) {