lisp/org-clock.el | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 3448d84..de7fcab 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2619,6 +2619,24 @@ from the dynamic block definition."
     ;; When exporting subtrees or regions the region might be
     ;; activated, so let's disable ̀delete-active-region'
     (let ((delete-active-region nil)) (backward-delete-char 1))
+    ;; Back to beginning, align the table, recalculate if necessary
+    (goto-char ipos)
+    (skip-chars-forward "^|")
+    (org-table-align)
+    (when org-hide-emphasis-markers
+      ;; we need to align a second time
+      (org-table-align))
+    (when sort
+      (save-excursion
+	(org-table-goto-line 3)
+	(org-table-goto-column (car sort))
+	(org-table-sort-lines nil (cdr sort))))
+    (when rm-file-column
+      ;; The file column is actually not wanted
+      (forward-char 1)
+      (org-table-delete-column))
+    (goto-char (org-table-end))
+    (backward-char 1)
     (if (setq formula (plist-get params :formula))
 	(cond
 	 ((eq formula '%)
@@ -2654,18 +2672,6 @@ from the dynamic block definition."
 	  (setq recalc t)
 	  (insert "\n" (match-string 1 (plist-get params :content)))
 	  (beginning-of-line 0))))
-    ;; Back to beginning, align the table, recalculate if necessary
-    (goto-char ipos)
-    (skip-chars-forward "^|")
-    (org-table-align)
-    (when org-hide-emphasis-markers
-      ;; we need to align a second time
-      (org-table-align))
-    (when sort
-      (save-excursion
-	(org-table-goto-line 3)
-	(org-table-goto-column (car sort))
-	(org-table-sort-lines nil (cdr sort))))
     (when recalc
       (if (eq formula '%)
 	  (save-excursion
@@ -2673,10 +2679,6 @@ from the dynamic block definition."
 	    (org-table-goto-column pcol nil 'force)
 	    (insert "%")))
       (org-table-recalculate 'all))
-    (when rm-file-column
-      ;; The file column is actually not wanted
-      (forward-char 1)
-      (org-table-delete-column))
     total-time))
 
 (defun org-clocktable-indent-string (level)