diff --git a/src/controls/QskAbstractButton.cpp b/src/controls/QskAbstractButton.cpp
index c215fc0e..e983c858 100644
--- a/src/controls/QskAbstractButton.cpp
+++ b/src/controls/QskAbstractButton.cpp
@@ -85,7 +85,7 @@ void QskAbstractButton::releaseButton()
         // maybe there is more work to have the signals coming
         // in a logical order. TODO ...
 
-        setCheckedState( !( skinState() & Checked ) );
+        setCheckedState( !hasSkinState( Checked ) );
     }
 
     setPressed( false );
@@ -99,12 +99,12 @@ void QskAbstractButton::setCheckedState( bool on )
 
 void QskAbstractButton::toggle()
 {
-    setChecked( !( skinState() & Checked ) );
+    setChecked( !isChecked() );
 }
 
 bool QskAbstractButton::isPressed() const
 {
-    return skinState() & Pressed;
+    return hasSkinState( Pressed );
 }
 
 void QskAbstractButton::setPressed( bool on )
@@ -171,7 +171,7 @@ void QskAbstractButton::setChecked( bool on )
 
 bool QskAbstractButton::isChecked() const
 {
-    return skinState() & Checked;
+    return hasSkinState( Checked );
 }
 
 void QskAbstractButton::setAutoRepeat( bool on )
diff --git a/src/controls/QskBoundedInput.cpp b/src/controls/QskBoundedInput.cpp
index 17a01c22..2269c3a2 100644
--- a/src/controls/QskBoundedInput.cpp
+++ b/src/controls/QskBoundedInput.cpp
@@ -173,7 +173,7 @@ void QskBoundedInput::setReadOnly( bool readOnly )
 
 bool QskBoundedInput::isReadOnly() const
 {
-    return skinState() & ReadOnly;
+    return hasSkinState( ReadOnly );
 }
 
 void QskBoundedInput::keyPressEvent( QKeyEvent* event )
diff --git a/src/controls/QskPopup.cpp b/src/controls/QskPopup.cpp
index 69d1f5de..478db4e0 100644
--- a/src/controls/QskPopup.cpp
+++ b/src/controls/QskPopup.cpp
@@ -207,7 +207,7 @@ void QskPopup::setOpen( bool on )
 
 bool QskPopup::isOpen() const
 {
-    return !( skinState() & QskPopup::Closed );
+    return !hasSkinState( QskPopup::Closed );
 }
 
 bool QskPopup::isFading() const
diff --git a/src/controls/QskPushButton.cpp b/src/controls/QskPushButton.cpp
index 4d5aafbc..d83b459a 100644
--- a/src/controls/QskPushButton.cpp
+++ b/src/controls/QskPushButton.cpp
@@ -115,7 +115,7 @@ void QskPushButton::setFlat( bool on )
 
 bool QskPushButton::isFlat() const
 {
-    return skinState() & Flat;
+    return hasSkinState( Flat );
 }
 
 void QskPushButton::setText( const QString& text )
diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp
index aa41552f..06814ed8 100644
--- a/src/controls/QskSkinnable.cpp
+++ b/src/controls/QskSkinnable.cpp
@@ -888,6 +888,11 @@ const QVariant& QskSkinnable::storedHint(
     return hintInvalid;
 }
 
+bool QskSkinnable::hasSkinState( QskAspect::State state ) const
+{
+    return ( m_data->skinState & state ) == state;
+}
+
 QskAspect::State QskSkinnable::skinState() const
 {
     return m_data->skinState;
diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h
index 5481b8d4..111932a0 100644
--- a/src/controls/QskSkinnable.h
+++ b/src/controls/QskSkinnable.h
@@ -132,6 +132,7 @@ class QSK_EXPORT QskSkinnable
 
     void replaceSkinState( QskAspect::State );
 
+    bool hasSkinState( QskAspect::State ) const;
     QskAspect::State skinState() const;
 
     const char* skinStateAsPrintable() const;
diff --git a/src/controls/QskSlider.cpp b/src/controls/QskSlider.cpp
index 8c62da92..40b25582 100644
--- a/src/controls/QskSlider.cpp
+++ b/src/controls/QskSlider.cpp
@@ -62,7 +62,7 @@ QskSlider::~QskSlider()
 
 bool QskSlider::isPressed() const
 {
-    return skinState() & Pressed;
+    return hasSkinState( Pressed );
 }
 
 void QskSlider::setOrientation( Qt::Orientation orientation )
diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp
index f89f66a1..229d0def 100644
--- a/src/controls/QskTextInput.cpp
+++ b/src/controls/QskTextInput.cpp
@@ -648,7 +648,7 @@ void QskTextInput::setReadOnly( bool on )
 
 void QskTextInput::setEditing( bool on )
 {
-    if ( isReadOnly() || on == ( skinState() & Editing ) )
+    if ( isReadOnly() || on == isEditing() )
         return;
 
     setSkinStateFlag( Editing, on );
@@ -678,7 +678,7 @@ void QskTextInput::setEditing( bool on )
 
 bool QskTextInput::isEditing() const
 {
-    return skinState() & Editing;
+    return hasSkinState( Editing );
 }
 
 void QskTextInput::ensureVisible( int position )