diff --git a/src/edt/edt/edtTextService.cc b/src/edt/edt/edtTextService.cc
index fe3470a51..c016b7536 100644
--- a/src/edt/edt/edtTextService.cc
+++ b/src/edt/edt/edtTextService.cc
@@ -157,14 +157,9 @@ TextService::get_text () const
 void 
 TextService::do_finish_edit ()
 {
-  get_edit_layer ();
-
-  if (manager ()) {
-    manager ()->transaction (tl::to_string (tr ("Create text")));
-  }
-  cell ().shapes (layer ()).insert (get_text ());
-  if (manager ()) {
-    manager ()->commit ();
+  {
+    db::Transaction transaction (manager (), tl::to_string (tr ("Create text")));
+    cell ().shapes (layer ()).insert (get_text ());
   }
 
   commit_recent ();
diff --git a/src/laybasic/laybasic/layLayoutViewBase.cc b/src/laybasic/laybasic/layLayoutViewBase.cc
index 67c07e246..35c60e745 100644
--- a/src/laybasic/laybasic/layLayoutViewBase.cc
+++ b/src/laybasic/laybasic/layLayoutViewBase.cc
@@ -5608,7 +5608,7 @@ LayoutViewBase::paste ()
 
   db::DBox sel_bbox = selection_bbox ();
   if (! sel_bbox.empty ()) {
-    if (m_paste_display_mode == 1) {
+    if (m_paste_display_mode == 1 || (m_paste_display_mode == 2 && sel_bbox.is_point ())) {
       // just make selection visible, i.e. shift window somewhat
       pan_center (sel_bbox.center ());
     } else if (m_paste_display_mode == 2) {