diff --git a/src/select.c b/src/select.c
index a363beb6..a186aa66 100644
--- a/src/select.c
+++ b/src/select.c
@@ -196,35 +196,9 @@ void symbol_bbox(int i, double *x1,double *y1, double *x2, double *y2)
 static void del_rect_line_arc_poly(int floaters)
 {
  xRect tmp;
- int c, j, i, k, itmp;
- double dtmp;
- #if HAS_CAIRO==1
- int customfont;
- #endif
+ int c, j, i;
  int deleted = 0;
 
- for(k=0;k<xctx->lastsel; ++k)
- {
-   double xx1, yy1, xx2, yy2;
-   int n=xctx->sel_array[k].n;
-   int type=xctx->sel_array[k].type;
-   if(type==xTEXT && xctx->text[n].sel==SELECTED) {
-
-     #if HAS_CAIRO==1
-     customfont = set_text_custom_font(&xctx->text[n]);
-     #endif
-     text_bbox(get_text_floater(n), xctx->text[n].xscale,
-               xctx->text[n].yscale, xctx->text[n].rot,xctx->text[n].flip, xctx->text[n].hcenter,
-               xctx->text[n].vcenter, xctx->text[n].x0, xctx->text[n].y0,
-               &xx1,&yy1,&xx2,&yy2, &itmp, &dtmp);
-     #if HAS_CAIRO==1
-     if(customfont) {
-       cairo_restore(xctx->cairo_ctx);
-     }
-     #endif
-     if(!floaters) bbox(ADD, xx1, yy1, xx2, yy2 );
-   }
- }
  for(c=0;c<cadlayers; ++c)
  {
   j = 0;
@@ -297,8 +271,6 @@ static void del_rect_line_arc_poly(int floaters)
   }
   xctx->arcs[c] -= j;
 
-
-
   j = 0;
   for(i=0;i<xctx->polygons[c]; ++i)
   {
@@ -497,7 +469,35 @@ void delete(int to_push_undo)
 
 void delete_only_rect_line_arc_poly(void)
 {
+ int k, itmp;
+ double dtmp;
+ #if HAS_CAIRO==1 
+ int customfont;
+ #endif
+
  bbox(START, 0.0 , 0.0 , 0.0 , 0.0);
+ for(k=0;k<xctx->lastsel; ++k)
+ {
+   double xx1, yy1, xx2, yy2;
+   int n=xctx->sel_array[k].n;
+   int type=xctx->sel_array[k].type;
+   /* text bboxes are calculated because this function is called in change_layer() */
+   if(type==xTEXT && xctx->text[n].sel==SELECTED) {
+     #if HAS_CAIRO==1
+     customfont = set_text_custom_font(&xctx->text[n]);
+     #endif
+     text_bbox(get_text_floater(n), xctx->text[n].xscale,
+               xctx->text[n].yscale, xctx->text[n].rot,xctx->text[n].flip, xctx->text[n].hcenter,
+               xctx->text[n].vcenter, xctx->text[n].x0, xctx->text[n].y0,
+               &xx1,&yy1,&xx2,&yy2, &itmp, &dtmp);
+     #if HAS_CAIRO==1
+     if(customfont) {
+       cairo_restore(xctx->cairo_ctx);
+     }
+     #endif
+     bbox(ADD, xx1, yy1, xx2, yy2 );
+   }
+ }
  del_rect_line_arc_poly(0);
  xctx->lastsel = 0;
  bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);