diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
index dbdfc5ef2..7ced4ba57 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@@ -1138,12 +1138,13 @@ void ScintillaEditView::defineDocType(LangType typeDoc)
 		case L_JAVA :
 		case L_RC :
 		case L_CS :
+		case L_FLASH :
 			setCppLexer(typeDoc); break;
 
 		case L_TCL :
             setTclLexer(); break;
 
-		case L_FLASH :
+		
         case L_OBJC :
             setObjCLexer(typeDoc); break;
 		
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
index 9f9f303e3..0bd693daa 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
+++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
@@ -244,9 +244,9 @@ FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0
 BEGIN
     LTEXT           "User language : ",IDC_LANGNAME_STATIC,0,3,63,8,0,WS_EX_RIGHT
     COMBOBOX        IDC_LANGNAME_COMBO,64,1,90,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Transparency",IDC_UD_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,150,3,66,10
-    CONTROL         "",IDC_UD_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,209,3,53,10
-    PUSHBUTTON      "Dock",IDC_DOCK_BUTTON,275,1,50,14,BS_FLAT
+    CONTROL         "Transparency",IDC_UD_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,165,3,66,10
+    CONTROL         "",IDC_UD_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,225,3,53,10
+    PUSHBUTTON      "Dock",IDC_DOCK_BUTTON,280,1,50,14,BS_FLAT
     
 	PUSHBUTTON      "Create New...",IDC_ADDNEW_BUTTON,34,20,62,14
     PUSHBUTTON      "Save As...",IDC_SAVEAS_BUTTON,104,20,62,14