diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
index dece8de..5889780 100644
--- a/glabels/ObjectEditor.cpp
+++ b/glabels/ObjectEditor.cpp
@@ -42,6 +42,7 @@ namespace glabels
 
 		lineColorButton->init( "No line", QColor(0,0,0,0), QColor(0,0,0,255) );
 		fillColorButton->init( "No fill", QColor(0,0,0,0), QColor(0,0,0,255) );
+		shadowColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) );
 
 		setEnabled( false );
 		hidePages();
@@ -114,6 +115,23 @@ namespace glabels
 	}
 
 
+	void ObjectEditor::loadShadowPage()
+	{
+		if ( mObject )
+		{
+			mBlocked = true;
+			
+			shadowEnableCheck->setChecked( mObject->shadow() );
+			shadowXSpin->setValue( mObject->shadowX() );
+			shadowYSpin->setValue( mObject->shadowY() );
+			shadowColorButton->setColorNode( mObject->shadowColorNode() );
+			shadowOpacitySpin->setValue( 100*mObject->shadowOpacity() );
+
+			mBlocked = false;			
+		}
+	}
+
+
 	void ObjectEditor::onLabelSizeChanged()
 	{
 		if ( mModel )
@@ -161,6 +179,7 @@ namespace glabels
 				loadLineFillPage();
 				loadPositionPage();
 				loadRectSizePage();
+				loadShadowPage();
 				
 				setEnabled( true );
 			}
@@ -190,6 +209,7 @@ namespace glabels
 		{
 			loadLineFillPage();
 			loadRectSizePage();
+			loadShadowPage();
 		}
 	}
 
@@ -272,6 +292,23 @@ namespace glabels
 	}
 
 
+	void ObjectEditor::onShadowControlsChanged()
+	{
+		if ( !mBlocked )
+		{
+			mBlocked = true;
+
+			mObject->setShadow( shadowEnableCheck->isChecked() );
+			mObject->setShadowX( shadowXSpin->value() );
+			mObject->setShadowY( shadowYSpin->value() );
+			mObject->setShadowColorNode( shadowColorButton->colorNode() );
+			mObject->setShadowOpacity( shadowOpacitySpin->value()/100.0 );
+
+			mBlocked = false;
+		}
+	}
+
+
 	void ObjectEditor::onChanged()
 	{
 		if ( !mBlocked )
diff --git a/glabels/ObjectEditor.h b/glabels/ObjectEditor.h
index 3bb66c9..4b35d30 100644
--- a/glabels/ObjectEditor.h
+++ b/glabels/ObjectEditor.h
@@ -59,6 +59,7 @@ namespace glabels
 		void loadLineFillPage();
 		void loadPositionPage();
 		void loadRectSizePage();
+		void loadShadowPage();
 		
 
 		/////////////////////////////////
@@ -74,6 +75,7 @@ namespace glabels
 		void onFillControlsChanged();
 		void onPositionControlsChanged();
 		void onRectSizeControlsChanged();
+		void onShadowControlsChanged();
 		void onChanged();
 		
 
diff --git a/glabels/ui/ObjectEditor.ui b/glabels/ui/ObjectEditor.ui
index 7c81586..2e87589 100644
--- a/glabels/ui/ObjectEditor.ui
+++ b/glabels/ui/ObjectEditor.ui
@@ -70,7 +70,7 @@
    <item row="1" column="0">
     <widget class="QTabWidget" name="notebook">
      <property name="currentIndex">
-      <number>4</number>
+      <number>5</number>
      </property>
      <widget class="QWidget" name="textPage">
       <attribute name="title">
@@ -1979,7 +1979,7 @@
    <sender>shadowEnableCheck</sender>
    <signal>toggled(bool)</signal>
    <receiver>ObjectEditor</receiver>
-   <slot>onChanged()</slot>
+   <slot>onShadowControlsChanged()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>58</x>
@@ -1995,7 +1995,7 @@
    <sender>shadowXSpin</sender>
    <signal>valueChanged(double)</signal>
    <receiver>ObjectEditor</receiver>
-   <slot>onChanged()</slot>
+   <slot>onShadowControlsChanged()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>125</x>
@@ -2011,7 +2011,7 @@
    <sender>shadowYSpin</sender>
    <signal>valueChanged(double)</signal>
    <receiver>ObjectEditor</receiver>
-   <slot>onChanged()</slot>
+   <slot>onShadowControlsChanged()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>147</x>
@@ -2027,7 +2027,7 @@
    <sender>shadowColorButton</sender>
    <signal>colorChanged()</signal>
    <receiver>ObjectEditor</receiver>
-   <slot>onChanged()</slot>
+   <slot>onShadowControlsChanged()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>106</x>
@@ -2043,7 +2043,7 @@
    <sender>shadowOpacitySpin</sender>
    <signal>valueChanged(int)</signal>
    <receiver>ObjectEditor</receiver>
-   <slot>onChanged()</slot>
+   <slot>onShadowControlsChanged()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>115</x>
@@ -2063,5 +2063,6 @@
   <slot>onFillControlsChanged()</slot>
   <slot>onPositionControlsChanged()</slot>
   <slot>onRectSizeControlsChanged()</slot>
+  <slot>onShadowControlsChanged()</slot>
  </slots>
 </ui>