diff --git a/src/common/QskGlobal.h b/src/common/QskGlobal.h
index 46394806..a083fdb0 100644
--- a/src/common/QskGlobal.h
+++ b/src/common/QskGlobal.h
@@ -55,4 +55,10 @@ void qskAsConst( const T && ) = delete;
 
 #endif
 
+#ifdef Q_FALLTHROUGH
+#define QSK_FALLTHROUGH Q_FALLTHROUGH
+#else
+#define QSK_FALLTHROUGH
+#endif
+
 #endif
diff --git a/src/controls/QskInputPanel.cpp b/src/controls/QskInputPanel.cpp
index d774258a..4395c987 100644
--- a/src/controls/QskInputPanel.cpp
+++ b/src/controls/QskInputPanel.cpp
@@ -338,8 +338,6 @@ QString QskInputPanel::displayLanguageName() const
                 default:
                     return QStringLiteral( "English (UK)" );
             }
-
-            break;
         }
 
         case QLocale::Spanish:
@@ -907,12 +905,14 @@ void QskInputPanel::updateLocale( const QLocale& locale )
             m_data->currentLayout = &qskInputPanelLayouts.zh;
             break;
 
-        default:
-            qWarning() << "QskInputPanel: unsupported locale:" << locale;
-
         case QLocale::C:
             m_data->currentLayout = &qskInputPanelLayouts.en_US;
             break;
+
+        default:
+            qWarning() << "QskInputPanel: unsupported locale:" << locale;
+            m_data->currentLayout = &qskInputPanelLayouts.en_US;
+
     }
 
     Q_EMIT displayLanguageNameChanged();