diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index e46ad511..8a9e6749 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=2
 Release=0
-Build=1
+Build=2
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.2.0.1
+FileVersion=1.2.0.2
 InternalName=
 LegalCopyright=
 LegalTrademarks=
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index 64146805..a4e4520b 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 e9c1ad5e..d10553d3 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas
index 95f3769f..2453f8bd 100755
--- a/editor/studio/UnitfrmMain.pas
+++ b/editor/studio/UnitfrmMain.pas
@@ -2787,23 +2787,30 @@ begin
 
   eShortcut := Shortcut(Msg.CharCode, KeyDataToShiftState(Msg.KeyData));
   // Some menu commands are suppressed by the controlchars thingy, so they will be triggered manually
-  for i := 0 to frmMain.tbxMenu.Items.Count -1 do begin
-    if TriggerMenuShortcut(eShortcut, frmMain.tbxMenu.Items[i]) then
+  for i := 0 to tbxMenu.Items.Count -1 do begin
+    if TriggerMenuShortcut(eShortcut, tbxMenu.Items[i]) then
       Handled := True;
   end;
-  for i := 0 to frmMain.tbxToolbar.Items.Count -1 do begin
-    if frmMain.tbxToolbar.Items[i].ShortCut = eShortcut then begin
+  for i := 0 to tbxToolbar.Items.Count -1 do begin
+    if tbxToolbar.Items[i].ShortCut = eShortcut then begin
       Handled := True;
-      frmMain.tbxToolbar.Items[i].OnClick(Self);
+      tbxToolbar.Items[i].OnClick(Self);
     end;
   end;
-  for i := 0 to frmMain.tbxEdit.Items.Count -1 do begin
-    if frmMain.tbxEdit.Items[i].ShortCut = eShortcut then begin
+  for i := 0 to tbxEdit.Items.Count -1 do begin
+    if tbxEdit.Items[i].ShortCut = eShortcut then begin
       Handled := True;
-      frmMain.tbxEdit.Items[i].OnClick(Self);
+      tbxEdit.Items[i].OnClick(Self);
+    end;
+  end;
+  for i := 0 to ppmEditor.Items.Count -1 do begin
+    if ppmEditor.Items[i].ShortCut = eShortcut then begin
+      Handled := True;
+      ppmEditor.Items[i].OnClick(Self);
     end;
   end;
   Application.ProcessMessages;
+  if Handled then exit;
   // Control chars
   if (eShortcut = Shortcut(Ord('E'), [ssCtrl])) then
     Handled := True;