diff --git a/lib/ChangeLog b/lib/ChangeLog
index cc9108dfcc..93ef6eedaa 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29	Martin Vermeer <martin.vermeer@hut.fi>
+
+	* ui/stdmenus.ui: fixed Note submenu issues
+
 2003-07-29	Martin Vermeer <martin.vermeer@hut.fi>
 
 	* ui/stdmenus.ui: submenu for Note/Comment/Greyedout
diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.ui
index 189f23fc58..4e7cd2f163 100644
--- a/lib/ui/stdmenus.ui
+++ b/lib/ui/stdmenus.ui
@@ -326,9 +326,9 @@ Menuset
 	End
 
 	Menu "insert_note"
-		Item "Yellow Note" "note-insert Note"
-		Item "LaTeX Comment" "note-insert Comment"
-		Item "Greyed Out" "note-insert Greyedout"
+		Item "LyX Note|N" "note-insert Note"
+		Item "Comment|C" "note-insert Comment"
+		Item "Greyed Out|G" "note-insert Greyedout"
 	End
 
 #
diff --git a/src/ChangeLog b/src/ChangeLog
index 91e759a3cf..d35ddb2868 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-30	Martin Vermeer  <martin.vermeer@hut.fi>
+
+	* factory.C: fixed Note submenu issues
+
 2003-07-30	Martin Vermeer  <martin.vermeer@hut.fi>
 
 	* factory.C: submenu for Note/Comment/Greyedout
diff --git a/src/factory.C b/src/factory.C
index c8a4965ef5..d6cd83b8c5 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -62,6 +62,7 @@ InsetOld * createInset(FuncRequest const & cmd)
 {
 	BufferView * bv = cmd.view();
 	BufferParams const & params = bv->buffer()->params;
+	string arg;
 
 	switch (cmd.action) {
 	case LFUN_HFILL:
@@ -71,7 +72,10 @@ InsetOld * createInset(FuncRequest const & cmd)
 		return new InsetMinipage(params);
 
 	case LFUN_INSERT_NOTE:
-		return new InsetNote(params, cmd.getArg(0));
+		arg = cmd.getArg(0);
+		if (arg.empty())
+			arg = "Note";
+		return new InsetNote(params, arg);
 
 	case LFUN_INSET_ERT:
 		return new InsetERT(params);