diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index 8727da16..2d1697ab 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=3
 Release=0
-Build=35
+Build=36
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.3.0.35
+FileVersion=1.3.0.36
 InternalName=
 LegalCopyright=
 LegalTrademarks=
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index 84a1b93a..8254e5f9 100755
Binary files a/editor/studio/AMXX_Studio.exe and b/editor/studio/AMXX_Studio.exe differ
diff --git a/editor/studio/AMXX_Studio.res b/editor/studio/AMXX_Studio.res
index 55c9d493..33f591ff 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/UnitfrmClose.dfm b/editor/studio/UnitfrmClose.dfm
index 8c1ff47a..3973e499 100755
Binary files a/editor/studio/UnitfrmClose.dfm and b/editor/studio/UnitfrmClose.dfm differ
diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas
index 873f24ac..a59fde7a 100755
--- a/editor/studio/UnitfrmMain.pas
+++ b/editor/studio/UnitfrmMain.pas
@@ -1996,8 +1996,9 @@ begin
             end;
           end;
         end;
-      end
-      else if (eCurrStyle = 11) or (eCurrStyle = 10) or (eCurrStyle = 9) or (eCurrStyle = 8) or (eCurrStyle = 5) or (eCurrStyle = 4) or (eCurrStyle = 0) or (eCurrStyle >= 34) then
+      end;
+      
+      if (eCurrStyle = 11) or (eCurrStyle = 10) or (eCurrStyle = 9) or (eCurrStyle = 8) or (eCurrStyle = 5) or (eCurrStyle = 4) or (eCurrStyle = 0) or (eCurrStyle >= 34) then
         CancelDisplay := False
       else
         CancelDisplay := True;
@@ -2141,7 +2142,7 @@ var i: integer;
 begin
   CancelDisplay := not Plugin_CallTipShow(ListToDisplay.GetText);
   eFunction := GetCurrFunc;
-  if (frmSettings.chkAutoHideCT.Checked) and (eFunction <> '') then begin
+  if (frmSettings.chkAutoHideCT.Checked) and (not CancelDisplay) and (eFunction <> '') then begin
     eFunction := LowerCase(eFunction);
 
     for i := 0 to eACList.Count -1 do begin
diff --git a/editor/studio/UnitfrmSettings.dfm b/editor/studio/UnitfrmSettings.dfm
index 513e6ccb..e8bfa264 100755
--- a/editor/studio/UnitfrmSettings.dfm
+++ b/editor/studio/UnitfrmSettings.dfm
@@ -64,7 +64,7 @@ object frmSettings: TfrmSettings
     Top = 0
     Width = 351
     Height = 260
-    ActivePage = jspAutocompleteCheck
+    ActivePage = jspHighlighter
     PropagateEnable = False
     Align = alClient
     OnChange = jplSettingsChange
@@ -110,7 +110,7 @@ object frmSettings: TfrmSettings
         Height = 21
         Style = csDropDownList
         Color = clWindow
-        ItemHeight = 0
+        ItemHeight = 13
         TabOrder = 0
         ItemIndex = -1
         OnChange = cboLanguageChange