2 files changed, 2 insertions, 4 deletions
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index f29a68691..c910607a9 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -426,8 +426,7 @@ static void sp_spray_transform_path(SPItem * item, Geom::Path &path, Geom::Affin
     if (item->parent) {
         dt2p = static_cast<SPItem *>(item->parent)->i2dt_affine().inverse();
     } else {
-        SPDesktop *dt = SP_ACTIVE_DESKTOP;
-        dt2p = dt->dt2doc();
+        dt2p = item->document->dt2doc();
     }
     Geom::Affine i2dt = item->i2dt_affine() * Geom::Translate(center).inverse() * affine * Geom::Translate(center);
     path *= i2dt * dt2p;
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 18fefa508..b8d66817b 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -1669,8 +1669,7 @@ static void sp_text_context_update_cursor(TextTool *tc,  bool scroll_to_see)
             if (opt_frame) {
                 // User units to screen pixels
                 Geom::Rect frame = *opt_frame;
-                frame *= SP_TEXT(tc->text)->i2doc_affine();
-                frame *= SP_ACTIVE_DESKTOP->dt2doc().inverse();
+                frame *= tc->text->i2dt_affine();
 
                 SP_CTRLRECT(tc->frame)->setRectangle(frame);
                 sp_canvas_item_show(tc->frame);