diff --git a/ChangeLog b/ChangeLog
index 82986783d..fb46d85c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
 2002-02-11  Anders Carlsson  <andersca@gnu.org>
 
-	* src/theme-parser.c (parse_toplevel_element): Always set 
-	title_scale_val.
+	* src/theme.c (meta_frame_layout_new): Set title_scale to 1.0
 
 2002-02-11  Bastien Nocera  <hadess@hadess.net>
 
diff --git a/src/theme-parser.c b/src/theme-parser.c
index ff66a9ebd..48b632867 100644
--- a/src/theme-parser.c
+++ b/src/theme-parser.c
@@ -776,7 +776,8 @@ parse_toplevel_element (GMarkupParseContext  *context,
       if (has_title) /* only if explicit, otherwise inherit */
         info->layout->has_title = has_title_val;
 
-      info->layout->title_scale = title_scale_val;
+      if (title_scale)
+	info->layout->title_scale = title_scale_val;
       
       meta_theme_insert_layout (info->theme, name, info->layout);
 
diff --git a/src/theme.c b/src/theme.c
index 5e9dd8909..f241593d9 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -334,6 +334,7 @@ meta_frame_layout_new  (void)
   layout->button_height = -1;
 
   layout->has_title = TRUE;
+  layout->title_scale = 1.0;
   
   init_border (&layout->button_border);