diff --git a/src/robotide/application/releasenotes.py b/src/robotide/application/releasenotes.py
index 5ae4e6a1d..3a2db0640 100644
--- a/src/robotide/application/releasenotes.py
+++ b/src/robotide/application/releasenotes.py
@@ -301,7 +301,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">
 python -m robotide.postinstall -install
 </pre>
-<p>RIDE {VERSION} was released on 15/June/2024.</p>
+<p>RIDE {VERSION} was released on 16/June/2024.</p>
 <!-- <br/>
 <h3>May The Fourth Be With You!</h3>
 <h3>Celebrate the bank holiday, 10th June, Day of Portugal, Portuguese Communities and Camões!!</h3>
diff --git a/src/robotide/editor/kweditor.py b/src/robotide/editor/kweditor.py
index 1b2a6fc72..f57b9b74c 100755
--- a/src/robotide/editor/kweditor.py
+++ b/src/robotide/editor/kweditor.py
@@ -60,7 +60,10 @@ def decorated_function(self, *args):
         if not self.has_focus():
             return
         if self.has_focus() or self.IsCellEditControlShown() or _row_header_selected_on_linux(self):
+            self.grid_cursor = (self.GetGridCursorRow(), self.GetGridCursorCol())
+            # print(f"DEBUG: requires_focus grid cursor= {self.grid_cursor}")
             function(self, *args)
+            self.SetGridCursor(self.grid_cursor)
 
     return decorated_function
 
@@ -82,6 +85,7 @@ def __init__(self, parent, controller, tree):
         self.color_foreground_text = self.general_settings['foreground text']
         GridEditor.__init__(self, parent, len(controller.steps) + 5, max((controller.max_columns + 1), 5),
                             parent.plugin.grid_popup_creator)
+        self.grid_cursor = (0, 0)
         self._popup_items = ([
                              _('Insert Cells\tCtrl-Shift-I'), _('Delete Cells\tCtrl-Shift-D'),
                              _('Insert Rows\tCtrl-I'), _('Delete Rows\tCtrl-D'), '---',
@@ -276,6 +280,7 @@ def _make_bindings(self):
         self.Bind(grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_label_left_click)
         self.Bind(wx.EVT_KILL_FOCUS, self.on_kill_focus)
         self.Bind(wx.EVT_MOUSEWHEEL, self.on_zoom)
+        self.Bind(wx.EVT_SET_FOCUS, self.on_focus)  # Attempt to keep cursor on a cell always (not really working)
 
     def get_tooltip_content(self):
         if self.IsCellEditControlShown() or self._popup_menu_shown:
@@ -311,6 +316,10 @@ def on_select_cell(self, event):
             wx.CallAfter(self.SelectBlock,rows[0], 0, rows[-1], self.NumberCols-1)
         self._colorize_grid()
 
+    def on_focus(self, event):
+        self.GoToCell(self.grid_cursor)
+        event.Skip()
+
     def on_kill_focus(self, event):
         # if self.col_label_element:
         #     try:
@@ -518,14 +527,17 @@ def on_sharp_uncomment_rows(self, event=None):
         self._resize_grid()
         self._skip_except_on_mac(event)
 
+    @requires_focus
     def on_move_rows_up(self, event=None):
         __ = event
         self._row_move(MoveRowsUp, -1)
 
+    @requires_focus
     def on_move_rows_down(self, event=None):
         __ = event
         self._row_move(MoveRowsDown, 1)
 
+    @requires_focus
     def on_swap_row_up(self, event=None):
         __ = event
         self._row_move(MoveRowsUp, 1, True)
@@ -639,7 +651,8 @@ def cell_value_edited(self, row, col, value):
     def get_selected_datafile_controller(self):
         return self._controller.datafile_controller
 
-    # DEBUG @requires_focus
+    # DEBUG
+    @requires_focus
     def on_copy(self, event=None):
         __ = event
         if self._copy == 1:
@@ -654,25 +667,27 @@ def on_copy(self, event=None):
         self._ccells = (self.selection.topleft, self.selection.bottomright)
         self.copy()
 
-    # DEBUG @requires_focus
+    # DEBUG
+    @requires_focus
     def on_cut(self, event=None):
         if self._copy == 1:
-            if self._ccells == (self.selection.topleft, self.selection.bottomright):
-                self._copy = 0
-                self._ccells = None
-                return
-        else:
-            self._copy = 1
+            # if self._ccells == (self.selection.topleft, self.selection.bottomright):
+            self._copy = 0
+            self._ccells = None
+            return
         self._clipboard_handler.cut()
+        self._copy = 1
         self.on_delete(event)
 
+    @requires_focus
     def on_delete(self, event=None):
         __ = event
         if not self.IsCellEditControlShown():
             self._execute(clear_area(self.selection.topleft, self.selection.bottomright))
             self._resize_grid()
 
-    # DEBUG    @requires_focus
+    # DEBUG
+    @requires_focus
     def on_paste(self, event=None):
         __ = event
         # print(f"DEBUG: kweditor.py on_paste ENTER selection={self.selection.topleft}, {self.selection.bottomright}")
@@ -691,19 +706,22 @@ def _execute_clipboard_command(self, command_class):
                 data = [[data]] if isinstance(data, str) else data
                 self._execute(command_class(self.selection.topleft, data))
 
-    # DEBUG @requires_focus
+    # DEBUG
+    @requires_focus
     def on_insert(self, event=None):
         __ = event
         self._execute_clipboard_command(insert_area)
         self._resize_grid()
 
+    @requires_focus
     def on_delete_rows(self, event):
         self._execute(delete_rows(self.selection.rows()))
         self.ClearSelection()
         self._resize_grid()
         self._skip_except_on_mac(event)
 
-    # DEBUG @requires_focus
+    # DEBUG
+    @requires_focus
     def on_undo(self, event=None):
         __ = event
         if not self.IsCellEditControlShown():
@@ -712,7 +730,8 @@ def on_undo(self, event=None):
             self.GetCellEditor(*self.selection.cell).Reset()
         self._resize_grid()
 
-    # DEBUG @requires_focus
+    # DEBUG
+    @requires_focus
     def on_redo(self, event=None):
         __ = event
         self._execute(Redo())
diff --git a/src/robotide/editor/texteditor.py b/src/robotide/editor/texteditor.py
index 2ce17a14f..6adc89d0c 100644
--- a/src/robotide/editor/texteditor.py
+++ b/src/robotide/editor/texteditor.py
@@ -442,19 +442,21 @@ def _sanity_check(self, data, text):
         #       f" result={result}")
         return True if not result else result
 
-        """ DEBUG
-        formatted_text = data.format_text(text)
-        c = self._normalize(formatted_text)
-        e = self._normalize(text)
-        return len(c) == len(e)
-        """
+    """ DEBUG
+    formatted_text = data.format_text(text)
+    c = self._normalize(formatted_text)
+    e = self._normalize(text)
+    return len(c) == len(e)
+    """
 
+    """ DEBUG: This is no longer used
     @staticmethod
     def _normalize(text):
         for item in tuple(string.whitespace) + ('...', '*'):
             if item in text:
                 text = text.replace(item, '')
         return text
+    """
 
     def _handle_sanity_check_failure(self, message):
         if self._last_answer == wx.ID_NO and time() - self._last_answer_time <= 0.2:
@@ -517,7 +519,8 @@ def _create_target(self, content=None):
         data = self.wrapper_data.data
         target_class = type(data)
         self._doc_language = obtain_language(self._doc_language, content=content)
-        # print(f"DEBUG: textedit.py DataFileWrapper _create_target self._doc_language={self._doc_language}")
+        # print(f"DEBUG: textedit.py DataFileWrapper _create_target self._doc_language={self._doc_language}"
+        #       f"\n target class={target_class}")
         if isinstance(data, robotapi.TestDataDirectory):
             target = robotapi.TestDataDirectory(parent=None, source=self.wrapper_data.directory,
                                                 settings=self._settings, language=self._doc_language)
@@ -544,6 +547,7 @@ def _txt_data(self, data):
             # print(f"DEBUG: textedit.py DataFileWrapper content _txt_data = {text=} language={self._doc_language}")
         return text
 
+    """ DEBUG: This is no longer used
     def collapse_blanks(self, content: str) -> str:
         spaces = self._tab_size * ' '
         block = []
@@ -566,6 +570,7 @@ def collapse_blanks(self, content: str) -> str:
             new_text = new_text.strip(' ') + '\n'
         # print(f"DEBUG: texteditor.py collapse_blanks new_text={new_text}")
         return new_text
+    """
 
 
 class SourceEditor(wx.Panel):
diff --git a/src/robotide/lib/robot/parsing/datarow.py b/src/robotide/lib/robot/parsing/datarow.py
index d805d13d0..2a98fd60a 100644
--- a/src/robotide/lib/robot/parsing/datarow.py
+++ b/src/robotide/lib/robot/parsing/datarow.py
@@ -98,17 +98,21 @@ def all(self):
 
     @property
     def data(self):
+        """ DEBUG: Keep identation with continuation marker
         if self.is_continuing():
-            index = self.cells.index(self._row_continuation_marker) + 1
+
+            index = self.cells.index(self._row_continuation_marker)  # + 1  DEBUG: Keep the continuation marker
             start = 0
             if len(self.cells) > 1:
                 for idx in range(index, len(self.cells)):
                     start = idx
                     if self.cells[start] != '':
                         break
-                # print(f"DEBUG: datarow.py data returning from continuation row idx={start} data={self.cells}")
+                print(f"DEBUG: datarow.py data returning from continuation row idx={start} data={self.cells}\n"
+                      f"returning {self.cells[start:]}")
                 return self.cells[start:]
-        return [c.strip() for c in self.cells]  #self.cells
+        """
+        return [c.strip() for c in self.cells]
 
     def dedent(self):
         # DEBUG: this is used only for debugging: import inspect
diff --git a/src/robotide/lib/robot/parsing/tablepopulators.py b/src/robotide/lib/robot/parsing/tablepopulators.py
index 3b4cc6182..e72347218 100644
--- a/src/robotide/lib/robot/parsing/tablepopulators.py
+++ b/src/robotide/lib/robot/parsing/tablepopulators.py
@@ -114,7 +114,7 @@ def populate(self):
 class _StepContainingTablePopulator(_TablePopulator):
 
     def _is_continuing(self, row):
-        return row.is_indented() and self._populator or row.is_commented()
+        return row.is_indented() and self._populator or row.is_continuing() or row.is_commented()
 
     def _is_cacheable_comment_row(self, row):
         return row.is_commented() and not self._populator
@@ -191,6 +191,8 @@ def add(self, row):
             self.row_continue = False
         dedented_row = row.dedent()
         if dedented_row:
+            if self.row_continue:
+                dedented_row.cells.insert(0, '')  # compensation for missing indent in blocks
             self._handle_data_row(dedented_row)
 
     def _handle_data_row(self, row):
@@ -212,8 +214,8 @@ def _populating_for_loop(self):
         return isinstance(self._populator, ForLoopPopulator)
 
     def _continues(self, row):
-        return ((row.is_continuing() and self._populator is not None) or
-                (self._populating_for_loop() and row.is_indented()))
+        return row.is_continuing() and self._populator is not None
+        # or (self._populating_for_loop() and row.is_indented()))
 
     def _populate_comment_row(self, crow):
         # print("DEBUG: _populate_comment_row ENTER %s" % crow)
diff --git a/src/robotide/lib/robot/writer/filewriters.py b/src/robotide/lib/robot/writer/filewriters.py
index 2dcea37ac..54caced3b 100644
--- a/src/robotide/lib/robot/writer/filewriters.py
+++ b/src/robotide/lib/robot/writer/filewriters.py
@@ -88,8 +88,9 @@ def _write_table(self, table, is_last):
         if not is_last:  # DEBUG: make this configurable
             # print(f"DEBUG: lib.robot.writer _DataFileWritter write_table empty_row table={table.type}")
             try:
-                if table.type == 'comments' or table.type == 'variable' and len(list(table)[-1].as_list()) == 0:
+                if table.type == 'variable' and len(list(table)[-1].as_list()) == 0:
                     # DEBUG: This is workaround for newline being added ALWAYS to VariableTable
+                    #  table.type == 'comments' or
                     return
             except IndexError:
                 pass
diff --git a/src/robotide/lib/robot/writer/rowsplitter.py b/src/robotide/lib/robot/writer/rowsplitter.py
index d43716749..d2ad55155 100644
--- a/src/robotide/lib/robot/writer/rowsplitter.py
+++ b/src/robotide/lib/robot/writer/rowsplitter.py
@@ -38,7 +38,8 @@ def split(self, row, table_type):
             return self._split_doc_row(row, indent)
         return self._split_row(row, indent)
 
-    def _split_empty_row(self):
+    @staticmethod
+    def _split_empty_row():
         yield []
 
     def _get_indent(self, row, table_type):
@@ -46,7 +47,8 @@ def _get_indent(self, row, table_type):
         min_indent = 1 if table_type in self._indented_tables else 0
         return max(indent, min_indent)
 
-    def _get_first_non_empty_index(self, row, indented=False):
+    @staticmethod
+    def _get_first_non_empty_index(row, indented=False):
         ignore = ['', '...'] if indented else ['']
         return len(list(itertools.takewhile(lambda x: x in ignore, row)))
 
@@ -67,7 +69,8 @@ def _split_doc_row(self, row, indent):
             row = [current] if current else []
             yield self._continue_row(row, indent)
 
-    def _split_doc(self, doc):
+    @staticmethod
+    def _split_doc(doc):
         if '\\n' not in doc:
             return doc, ''
         if '\\n ' in doc:
@@ -77,6 +80,7 @@ def _split_doc(self, doc):
     def _split_row(self, row, indent):
         while row:
             current, row = self._split(row)
+            # print(f"DEBUG: rowsplitter.py RowSplitter _split_row current={current} row={row}")
             yield self._escape_last_cell_if_empty(current)
             if row:
                 row = self._continue_row(row, indent)