diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx
index ea8f99e3519c..d9d4f7d3006f 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -73,9 +73,9 @@ public:
         {
             nProp = DFLT_ESC_PROP;
             if( SvxEscapement::Superscript == eNew )
-                nEsc = DFLT_ESC_SUPER;
+                nEsc = DFLT_ESC_AUTO_SUPER;
             else
-                nEsc = DFLT_ESC_SUB;
+                nEsc = DFLT_ESC_AUTO_SUB;
         }
     }
     SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); }
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 6c9714367bf7..fad17768fec2 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1840,6 +1840,20 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf147310)
     }
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf80194_autoSubscript)
+{
+    createSwDoc();
+
+    CPPUNIT_ASSERT_EQUAL_MESSAGE(
+        "Automatic mode enabled", false,
+        getProperty<bool>(getRun(getParagraph(1), 1), "CharAutoEscapement"));
+    dispatchCommand(mxComponent, ".uno:SubScript", {});
+    // Writer has always had automatic mode enabled when creating subscript/superscripts.
+    CPPUNIT_ASSERT_EQUAL_MESSAGE(
+        "Automatic mode enabled", true,
+        getProperty<bool>(getRun(getParagraph(1), 1), "CharAutoEscapement"));
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf64242_optimizeTable)
 {
     createSwDoc("tdf64242_optimizeTable.odt");
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index c5c90c8afc7c..68f4197f5437 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -115,10 +115,6 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
                 break;
             }
             SvxEscapementItem aEscape( eEscape, RES_CHRATR_ESCAPEMENT );
-            if(eEscape == SvxEscapement::Superscript)
-                aEscape.GetEsc() = DFLT_ESC_AUTO_SUPER;
-            else if(eEscape == SvxEscapement::Subscript)
-                aEscape.GetEsc() = DFLT_ESC_AUTO_SUB;
             rSh.SetAttrItem( aEscape );
             rReq.AppendItem( aEscape );
             rReq.Done();