diff --git a/tex/generic/pgf/systemlayer/pgfsys-dvisvgm.def b/tex/generic/pgf/systemlayer/pgfsys-dvisvgm.def
index f08e17d85..f817f5087 100644
--- a/tex/generic/pgf/systemlayer/pgfsys-dvisvgm.def
+++ b/tex/generic/pgf/systemlayer/pgfsys-dvisvgm.def
@@ -125,8 +125,9 @@
   \ht#1=\pgf@picmaxy%
   \wd#1=\pgf@picmaxx%
   \dp#1=0pt%
+  \leavevmode%
   \pgf@xa=\pgf@trimleft@final\relax  \ifdim\pgf@xa=0pt \else\kern\pgf@xa\fi%
-  \hbox{\raise-\pgf@ya\hbox{\ifpgf@sys@svg@inpicture\else\special{dvisvgm:bbox \pgf@sys@tonumber\pgf@picmaxx\space\pgf@sys@tonumber\pgf@picmaxy}\fi\box#1}}%
+  \raise-\pgf@ya\hbox{\ifpgf@sys@svg@inpicture\else\special{dvisvgm:bbox \pgf@sys@tonumber\pgf@picmaxx\space\pgf@sys@tonumber\pgf@picmaxy}\fi\box#1}%
   \pgf@xa=\pgf@trimright@final\relax \ifdim\pgf@xa=0pt \else\kern\pgf@xa\fi%
 }
 
diff --git a/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def b/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def
index 32eedd8dc..1f8c09d0c 100644
--- a/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def
+++ b/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def
@@ -202,8 +202,9 @@
   \ht#1=\pgf@picmaxy%
   \wd#1=\pgf@picmaxx%
   \dp#1=0pt%
+  \leavevmode
   \pgf@xa=\pgf@trimleft@final\relax  \ifdim\pgf@xa=0pt \else\kern\pgf@xa\fi
-  \hbox{\raise-\pgf@ya\box#1}%
+  \raise-\pgf@ya\box#1%
   \pgf@xa=\pgf@trimright@final\relax \ifdim\pgf@xa=0pt \else\kern\pgf@xa\fi
   \pgfsys@invoke{</g>\Hnewline </svg>\Hnewline }%
   \special{t4ht<\jobname-\the\pgf@sys@svg@picnum.svg}%
diff --git a/tex/generic/pgf/systemlayer/pgfsys.code.tex b/tex/generic/pgf/systemlayer/pgfsys.code.tex
index 9fc53c241..f25b11e5f 100644
--- a/tex/generic/pgf/systemlayer/pgfsys.code.tex
+++ b/tex/generic/pgf/systemlayer/pgfsys.code.tex
@@ -1569,8 +1569,9 @@
   \ht#1=\pgf@picmaxy%
   \wd#1=\pgf@picmaxx%
   \dp#1=0pt%
+  \leavevmode%
   \pgf@xa=\pgf@trimleft@final\relax  \ifdim\pgf@xa=0pt \else\kern\pgf@xa\fi
-  \hbox{\raise-\pgf@ya\box#1}%
+  \raise-\pgf@ya\box#1%
   \pgf@xa=\pgf@trimright@final\relax \ifdim\pgf@xa=0pt \else\kern\pgf@xa\fi
 }
 % Called after a picture has been typeset in box #1. This