2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f32d2ed..845fb5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.14:
+*05/06/07:
+  * Fixed justification in WorkspaceNameTool #1213262 (Mathias)
+    WorkspaceNameTool.cc
 *05/06/03:
   * Massive change of font handling (Mathias)
     - Usage of xft-fonts is prefered, except a font-description starts with '-'
diff --git a/src/WorkspaceNameTool.cc b/src/WorkspaceNameTool.cc
index fdc4ffe..ee6db7b 100644
--- a/src/WorkspaceNameTool.cc
+++ b/src/WorkspaceNameTool.cc
@@ -127,6 +127,12 @@ void WorkspaceNameTool::reRender() {
 }
 
 void WorkspaceNameTool::renderTheme(unsigned char alpha) {
+    
+    m_button.setJustify(m_theme.justify());
+    m_button.setBorderWidth(m_theme.border().width());
+    m_button.setBorderColor(m_theme.border().color());
+    m_button.setAlpha(alpha);
+
     if (!m_theme.texture().usePixmap()) {
         if (m_pixmap)
             m_screen.imageControl().removeImage(m_pixmap);
@@ -136,9 +142,5 @@ void WorkspaceNameTool::renderTheme(unsigned char alpha) {
         reRender();
     }
 
-    m_button.setJustify(m_theme.justify());
-    m_button.setBorderWidth(m_theme.border().width());
-    m_button.setBorderColor(m_theme.border().color());
-    m_button.setAlpha(alpha);
     m_button.clear();
 }