diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc
index 7086bd8484..d9050b44b0 100644
--- a/libs/ardour/midiport_manager.cc
+++ b/libs/ardour/midiport_manager.cc
@@ -70,7 +70,6 @@ MidiPortManager::create_ports ()
 
 	_vkbd_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("x-virtual-keyboard"), true, IsTerminal);
 	boost::dynamic_pointer_cast<AsyncMIDIPort>(_vkbd_out)->set_flush_at_cycle_start (true);
-	_vkbd_out->set_pretty_name (_("Virtual Keyboard"));
 
 	/* Now register ports used to send positional sync data (MTC and MIDI Clock) */
 
diff --git a/libs/ardour/session_bundles.cc b/libs/ardour/session_bundles.cc
index 8af2ae92f7..6d0ea23185 100644
--- a/libs/ardour/session_bundles.cc
+++ b/libs/ardour/session_bundles.cc
@@ -125,6 +125,7 @@ Session::setup_bundles ()
 	if (_midi_ports) {
 		boost::shared_ptr<Port> ap = boost::dynamic_pointer_cast<Port> (vkbd_output_port ());
 		inputs[DataType::MIDI].push_back (AudioEngine::instance()->make_port_name_non_relative (ap->name ()));
+		ap->set_pretty_name (_("Virtual Keyboard"));
 	}
 
 	/* Create a set of Bundle objects that map