diff --git a/KeyboardLayoutManager/KeyboardLayoutManager.cpp b/KeyboardLayoutManager/KeyboardLayoutManager.cpp
index c46f8043..f250325c 100644
--- a/KeyboardLayoutManager/KeyboardLayoutManager.cpp
+++ b/KeyboardLayoutManager/KeyboardLayoutManager.cpp
@@ -345,6 +345,11 @@ KeyboardLayoutManager::KeyboardLayoutManager(KEYBOARD_LAYOUT layout, KEYBOARD_SI
 
     switch(layout)
     {
+        case KEYBOARD_LAYOUT::KEYBOARD_LAYOUT_DEFAULT:
+        default:
+            tmp_name = KEYBOARD_NAME_DEFAULT;
+            break;
+
         case KEYBOARD_LAYOUT::KEYBOARD_LAYOUT_ANSI_QWERTY:
             ChangeKeys(ansi_qwerty);
             tmp_name = KEYBOARD_NAME_ANSI;
@@ -371,11 +376,6 @@ KeyboardLayoutManager::KeyboardLayoutManager(KEYBOARD_LAYOUT layout, KEYBOARD_SI
             ChangeKeys(jis);
             tmp_name = KEYBOARD_NAME_JIS;
             break;
-
-        default:
-            tmp_name = KEYBOARD_NAME_DEFAULT;
-            tmp_name.append(KEYBOARD_NAME_QWERTY);
-            break;
     }
 
     /*---------------------------------------------------------------------*\
diff --git a/KeyboardLayoutManager/KeyboardLayoutManager.h b/KeyboardLayoutManager/KeyboardLayoutManager.h
index 17e07342..efbfdbdc 100644
--- a/KeyboardLayoutManager/KeyboardLayoutManager.h
+++ b/KeyboardLayoutManager/KeyboardLayoutManager.h
@@ -40,7 +40,8 @@ enum KEYBOARD_SIZE
 
 enum KEYBOARD_LAYOUT
 {
-    KEYBOARD_LAYOUT_ANSI_QWERTY         = 0,
+    KEYBOARD_LAYOUT_DEFAULT             = 0,
+    KEYBOARD_LAYOUT_ANSI_QWERTY,
     KEYBOARD_LAYOUT_ISO_QWERTY,
     KEYBOARD_LAYOUT_ISO_QWERTZ,
     KEYBOARD_LAYOUT_ISO_AZERTY,