diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 8753da7fbe..f0ea8745c5 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -972,7 +972,6 @@ FuncStatus BufferView::Pimpl::getStatus(FuncRequest const & cmd)
 	case LFUN_FONT_STATE:
 	case LFUN_INSERT_LABEL:
 	case LFUN_BOOKMARK_SAVE:
-	case LFUN_LABEL_GOTO:
 	case LFUN_GOTO_PARAGRAPH:
 	case LFUN_GOTOERROR:
 	case LFUN_GOTONOTE:
@@ -987,6 +986,12 @@ FuncStatus BufferView::Pimpl::getStatus(FuncRequest const & cmd)
 		flag.enabled(true);
 		break;
 
+	case LFUN_LABEL_GOTO: {
+		flag.enabled(!cmd.argument.empty()
+		    || getInsetByCode<InsetRef>(cursor_, InsetBase::REF_CODE));
+		break;
+	}
+
 	case LFUN_BOOKMARK_GOTO:
 		flag.enabled(isSavedPosition(convert<unsigned int>(cmd.argument)));
 		break;
diff --git a/src/ChangeLog b/src/ChangeLog
index 3907b72139..a7f6265ee8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-06  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* BufferView_pimpl.C (getStatus): enable LFUN_GOTO_NOTE only
+	when it actually makes sense.
+
 2005-06-06  Martin Vermeer  <martin.vermeer@hut.fi>
 
 	* BufferView_pimpl.C: revert to showCursor in connection with