diff --git a/src/applets/wpa_supplicant.c b/src/applets/wpa_supplicant.c
index 24e929c..fa87628 100644
--- a/src/applets/wpa_supplicant.c
+++ b/src/applets/wpa_supplicant.c
@@ -111,9 +111,10 @@ typedef enum _WPAScanResult
 	WSR_BSSID,
 	WSR_FREQUENCY,
 	WSR_LEVEL,
-	WSR_SSID
+	WSR_SSID,
+	WSR_TOOLTIP
 } WPAScanResult;
-#define WSR_LAST WSR_SSID
+#define WSR_LAST WSR_TOOLTIP
 #define WSR_COUNT (WSR_LAST + 1)
 
 typedef struct _PanelApplet
@@ -208,7 +209,7 @@ static WPA * _wpa_init(PanelAppletHelper * helper, GtkWidget ** widget)
 #endif
 	wpa->store = gtk_list_store_new(WSR_COUNT, G_TYPE_BOOLEAN,
 			GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_UINT,
-			G_TYPE_UINT, G_TYPE_STRING);
+			G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
 	_wpa_start(wpa);
 	gtk_widget_show_all(hbox);
 	pango_font_description_free(bold);
diff --git a/tools/wifibrowser.c b/tools/wifibrowser.c
index 244ea1e..ae38653 100644
--- a/tools/wifibrowser.c
+++ b/tools/wifibrowser.c
@@ -130,6 +130,9 @@ static int _wifibrowser(char const * configfile, char const * interface)
 			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(wpa->store));
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), TRUE);
+#if GTK_CHECK_VERSION(2, 12, 0)
+	gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(view), WSR_TOOLTIP);
+#endif
 	/* signal level */
 	renderer = gtk_cell_renderer_pixbuf_new();
 	column = gtk_tree_view_column_new_with_attributes("", renderer,