diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index 3aedb116..8db0bff2 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=4
 Release=0
-Build=15
+Build=16
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.4.0.15
+FileVersion=1.4.0.16
 InternalName=gaben
 LegalCopyright=AMX Mod X Dev Team
 LegalTrademarks=
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index 3827c90a..c686bd1e 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 99308686..069a1809 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/UnitfrmMain.dfm b/editor/studio/UnitfrmMain.dfm
index 22fecbd5..62d16249 100755
--- a/editor/studio/UnitfrmMain.dfm
+++ b/editor/studio/UnitfrmMain.dfm
@@ -4402,7 +4402,9 @@ object frmMain: TfrmMain
             Width = 199
             Height = 427
             Align = alClient
+            ScrollBars = ssVertical
             TabOrder = 1
+            WantTabs = True
             OnKeyDown = rtfNotesKeyDown
             OnMouseDown = rtfNotesMouseDown
           end
diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas
index 5d9e86e8..14bb98c3 100755
--- a/editor/studio/UnitfrmMain.pas
+++ b/editor/studio/UnitfrmMain.pas
@@ -918,7 +918,10 @@ end;
 
 procedure TfrmMain.mnuUndoClick(Sender: TObject);
 begin
-  sciEditor.Undo;
+  if ActiveControl = sciEditor then
+    sciEditor.Undo
+  else if ActiveControl = rtfNotes then
+    rtfNotes.Undo;
 end;
 
 procedure TfrmMain.mnuSaveClick(Sender: TObject);
@@ -956,27 +959,42 @@ end;
 
 procedure TfrmMain.mnuRedoClick(Sender: TObject);
 begin
-  sciEditor.Redo;
+  if ActiveControl = sciEditor then
+    sciEditor.Redo
+  else if ActiveControl = rtfNotes then
+    rtfNotes.Undo;
 end;
 
 procedure TfrmMain.mnuCutClick(Sender: TObject);
 begin
-  sciEditor.Cut;
+  if ActiveControl = sciEditor then
+    sciEditor.Cut
+  else if ActiveControl = rtfNotes then
+    rtfNotes.CutToClipboard;
 end;
 
 procedure TfrmMain.mnuCopyClick(Sender: TObject);
 begin
-  sciEditor.Copy;
+  if ActiveControl = sciEditor then
+    sciEditor.Copy
+  else if ActiveControl = rtfNotes then
+    rtfNotes.CopyToClipboard;
 end;
 
 procedure TfrmMain.mnuPasteClick(Sender: TObject);
 begin
-  sciEditor.Paste;
+  if ActiveControl = sciEditor then
+    sciEditor.Paste
+  else if ActiveControl = rtfNotes then
+    rtfNotes.PasteFromClipboard;
 end;
 
 procedure TfrmMain.mnuSelectAllClick(Sender: TObject);
 begin
-  sciEditor.SelectAll;
+  if ActiveControl = sciEditor then
+    sciEditor.SelectAll
+  else if ActiveControl = rtfNotes then
+    rtfNotes.SelectAll;
 end;
 
 procedure TfrmMain.mnuCloseClick(Sender: TObject);