diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index bb618741b..5af146895 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -710,6 +710,9 @@ gui_scaling_filter_txr2img (GUI scaling filter txr2img) bool true
 #    Delay showing tooltips, stated in milliseconds.
 tooltip_show_delay (Tooltip delay) int 400
 
+#    Append itemstring to tooltip
+tooltip_append_itemstring (Append itemstring) bool false
+
 #    Whether freetype fonts are used, requires freetype support to be compiled in.
 freetype (Freetype fonts) bool true
 
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 5e4cf526c..5f3c97e9d 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -123,15 +123,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("keymap_slot21", "");
 	settings->setDefault("keymap_slot22", "");
 	settings->setDefault("keymap_slot23", "");
-	settings->setDefault("enable_build_where_you_stand", "false" );
-	settings->setDefault("3d_mode", "none");
-	settings->setDefault("3d_paralax_strength", "0.025");
-	settings->setDefault("aux1_descends", "false");
-	settings->setDefault("doubletap_jump", "false");
-	settings->setDefault("always_fly_fast", "true");
-	settings->setDefault("directional_colored_fog", "true");
-	settings->setDefault("tooltip_show_delay", "400");
-	settings->setDefault("zoom_fov", "15");
 
 	// Some (temporary) keys for debugging
 	settings->setDefault("keymap_quicktune_prev", "KEY_HOME");
@@ -152,6 +143,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("3d_mode", "none");
 	settings->setDefault("3d_paralax_strength", "0.025");
 	settings->setDefault("tooltip_show_delay", "400");
+	settings->setDefault("tooltip_append_itemstring", "false");
 	settings->setDefault("zoom_fov", "15");
 	settings->setDefault("fps_max", "60");
 	settings->setDefault("pause_fps_max", "20");
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 7b7bd7c29..ef2637400 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -112,6 +112,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(JoystickController *joystick,
 	m_doubleclickdetect[1].pos = v2s32(0, 0);
 
 	m_tooltip_show_delay = (u32)g_settings->getS32("tooltip_show_delay");
+	m_tooltip_append_itemstring = g_settings->getBool("tooltip_append_itemstring");
 }
 
 GUIFormSpecMenu::~GUIFormSpecMenu()
@@ -2388,9 +2389,13 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
 						utf8_to_wide(item.getDefinition(m_client->idef()).description);
 				else
 					tooltip_text = utf8_to_wide(desc);
-				// Show itemstring as fallback for easier debugging
-				if (!item.name.empty() && tooltip_text.empty())
-					tooltip_text = utf8_to_wide(item.name);
+
+				if (!item.name.empty()) {
+					if (tooltip_text.empty())
+						tooltip_text = utf8_to_wide(item.name);
+					if (m_tooltip_append_itemstring)
+						tooltip_text += utf8_to_wide(" [" + item.name + "]");
+				}
 			}
 			if (!tooltip_text.empty()) {
 				showTooltip(tooltip_text, m_default_tooltip_color,
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index c86d596b7..902f86ce1 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -407,6 +407,7 @@ protected:
 	gui::IGUIStaticText *m_tooltip_element = nullptr;
 
 	u64 m_tooltip_show_delay;
+	bool m_tooltip_append_itemstring;
 	u64 m_hovered_time = 0;
 	s32 m_old_tooltip_id = -1;