diff --git a/ChangeLog b/ChangeLog
index e0469fc13555a42bfe0332fa20d7e048efd32b67..05adb8af316d2a0dfe30f6ec5c437666f84774fb 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-03-06  Stanislas Rolland  <typo3@sjbr.ca>
 
 	* Fixed bug #10610: htmlArea RTE: Two errors in class.tx_rtehtmlarea_acronym.php (Thanks to Ursula Renziehausen).
+	* Fixed bug #6947: RTEfullScreenWidth by default please !
 
 2009-03-05  Benjamin Mack  <benni@typo3.org>
 
diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 149f06e82f9df5c4bbba825b68e7b37a19d82876..2152211200df328d7528160ad99f601b40f89d16 100644
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2009-03-06  Stanislas Rolland  <typo3@sjbr.ca>
 
 	* Fixed bug #10610: htmlArea RTE: Two errors in class.tx_rtehtmlarea_acronym.php (Thanks to Ursula Renziehausen).
+	* Fixed bug #6947: RTEfullScreenWidth by default please !
 
 2009-02-25  Stanislas Rolland  <typo3@sjbr.ca>
 
diff --git a/typo3/sysext/rtehtmlarea/res/demo/pageTSConfig.txt b/typo3/sysext/rtehtmlarea/res/demo/pageTSConfig.txt
index 5cfd21a1265cb0a25fec2393c8508a00753ff1c5..01e987f569b266ec5d4054f25965404b7e163ce3 100644
--- a/typo3/sysext/rtehtmlarea/res/demo/pageTSConfig.txt
+++ b/typo3/sysext/rtehtmlarea/res/demo/pageTSConfig.txt
@@ -250,7 +250,3 @@ RTE.default.FE < RTE.default
 RTE.default.FE.FE >
 RTE.default.FE.userElements >
 RTE.default.FE.userLinks >
-
-	## tt_content TCEFORM configuration
-	## Let use all the space available for more comfort.
-TCEFORM.tt_content.bodytext.RTEfullScreenWidth= 100%
diff --git a/typo3/sysext/rtehtmlarea/res/typical/pageTSConfig.txt b/typo3/sysext/rtehtmlarea/res/typical/pageTSConfig.txt
index 38c334c4ba09d87e7016c4e08328dc18583f840b..9b475f92e845b742ed0b709af5a30a8d291692a7 100644
--- a/typo3/sysext/rtehtmlarea/res/typical/pageTSConfig.txt
+++ b/typo3/sysext/rtehtmlarea/res/typical/pageTSConfig.txt
@@ -236,7 +236,3 @@ RTE.default.FE.hideButtons = chMode, blockstyle, textstyle, underline, strikethr
 RTE.default.FE.FE >
 RTE.default.FE.userElements >
 RTE.default.FE.userLinks >
-
-	## tt_content TCEFORM configuration
-	## Let use all the space available for more comfort.
-TCEFORM.tt_content.bodytext.RTEfullScreenWidth= 100%
diff --git a/typo3/wizard_rte.php b/typo3/wizard_rte.php
index da4cb63f0dda77a11787216f7acba5742f58fa20..a7ad51b40b87dcdeb59ea2c41505d20733416027 100755
--- a/typo3/wizard_rte.php
+++ b/typo3/wizard_rte.php
@@ -179,7 +179,7 @@ class SC_wizard_rte {
 			if (strcmp($fieldTSConfig['RTEfullScreenWidth'],''))	{
 				$width=$fieldTSConfig['RTEfullScreenWidth'];
 			} else {
-				$width='500';
+				$width='100%';
 			}
 
 				// Get the form field and wrap it in the table with the buttons: