diff --git a/Makefile b/Makefile
index 0b8d98f..8f20032 100644
--- a/Makefile
+++ b/Makefile
@@ -123,6 +123,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/tools/message.c \
 		$(PACKAGE)-$(VERSION)/tools/notify.c \
 		$(PACKAGE)-$(VERSION)/tools/test.c \
+		$(PACKAGE)-$(VERSION)/tools/wifibrowser.c \
 		$(PACKAGE)-$(VERSION)/tools/Makefile \
 		$(PACKAGE)-$(VERSION)/tools/helper.c \
 		$(PACKAGE)-$(VERSION)/tools/project.conf \
diff --git a/tools/Makefile b/tools/Makefile
index b74100c..5b901b4 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-TARGETS	= panel-embed panel-message panel-notify panel-test
+TARGETS	= panel-embed panel-message panel-notify panel-test wifibrowser
 PREFIX	= /usr/local
 DESTDIR	=
 BINDIR	= $(PREFIX)/bin
@@ -45,6 +45,13 @@ panel-test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L../src -Wl,-rpath,$(LIBDIR) -lPane
 panel-test: $(panel-test_OBJS)
 	$(CC) -o panel-test $(panel-test_OBJS) $(panel-test_LDFLAGS)
 
+wifibrowser_OBJS = wifibrowser.o
+wifibrowser_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -I ../include $(CFLAGSF) $(CFLAGS)
+wifibrowser_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+
+wifibrowser: $(wifibrowser_OBJS)
+	$(CC) -o wifibrowser $(wifibrowser_OBJS) $(wifibrowser_LDFLAGS)
+
 embed.o: embed.c ../include/Panel.h ../config.h
 	$(CC) $(panel-embed_CFLAGS) -c embed.c
 
@@ -57,8 +64,11 @@ notify.o: notify.c helper.c ../src/helper.c ../src/panel.h ../config.h
 test.o: test.c helper.c ../src/helper.c ../src/panel.h ../config.h
 	$(CC) $(panel-test_CFLAGS) -c test.c
 
+wifibrowser.o: wifibrowser.c ../src/applets/wpa_supplicant.c
+	$(CC) $(wifibrowser_CFLAGS) -c wifibrowser.c
+
 clean:
-	$(RM) -- $(panel-embed_OBJS) $(panel-message_OBJS) $(panel-notify_OBJS) $(panel-test_OBJS)
+	$(RM) -- $(panel-embed_OBJS) $(panel-message_OBJS) $(panel-notify_OBJS) $(panel-test_OBJS) $(wifibrowser_OBJS)
 
 distclean: clean
 	$(RM) -- $(TARGETS)
diff --git a/tools/project.conf b/tools/project.conf
index 2d4db71..3fec78b 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,4 +1,4 @@
-targets=panel-embed,panel-message,panel-notify,panel-test
+targets=panel-embed,panel-message,panel-notify,panel-test,wifibrowser
 cflags_force=-W `pkg-config --cflags libDesktop`
 cflags=-Wall -g -O2
 ldflags_force=`pkg-config --libs libDesktop`
@@ -29,6 +29,11 @@ cppflags=-D PREFIX=\"$(PREFIX)\"
 ldflags=-L../src -Wl,-rpath,$(LIBDIR) -lPanel
 sources=test.c
 
+[wifibrowser]
+type=binary
+cppflags=-I ../include
+sources=wifibrowser.c
+
 [embed.c]
 depends=../include/Panel.h,../config.h
 
@@ -40,3 +45,6 @@ depends=helper.c,../src/helper.c,../src/panel.h,../config.h
 
 [test.c]
 depends=helper.c,../src/helper.c,../src/panel.h,../config.h
+
+[wifibrowser.c]
+depends=../src/applets/wpa_supplicant.c
diff --git a/tools/wifibrowser.c b/tools/wifibrowser.c
new file mode 100644
index 0000000..820b627
--- /dev/null
+++ b/tools/wifibrowser.c
@@ -0,0 +1,119 @@
+/* $Id$ */
+/* Copyright (c) 2013 Pierre Pronchery <khorben@defora.org> */
+/* This file is part of DeforaOS Desktop Panel */
+/* This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+
+
+#include <stdio.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include "../src/applets/wpa_supplicant.c"
+
+/* constants */
+#ifndef PROGNAME
+# define PROGNAME	"wifibrowser"
+#endif
+
+
+/* WifiBrowser */
+/* private */
+/* prototypes */
+static int _error(Panel * panel, char const * message, int ret);
+static int _usage(void);
+
+/* callbacks */
+static gboolean _wifibrowser_on_closex(gpointer data);
+
+
+/* functions */
+/* error */
+static int _error(Panel * panel, char const * message, int ret)
+{
+	fputs(PROGNAME ": ", stderr);
+	perror(message);
+	return ret;
+}
+
+
+/* usage */
+static int _usage(void)
+{
+	fprintf(stderr, "Usage: %s\n", PROGNAME);
+	return 1;
+}
+
+
+/* callbacks */
+static gboolean _wifibrowser_on_closex(gpointer data)
+{
+	WPA * wpa = data;
+
+	gtk_widget_hide(wpa->widget);
+	gtk_main_quit();
+	return FALSE;
+}
+
+
+/* public */
+/* functions */
+/* main */
+int main(int argc, char * argv[])
+{
+	PanelAppletHelper helper;
+	WPA * wpa;
+	GtkWidget * window;
+	GtkWidget * view;
+	GtkWidget * widget;
+	GtkCellRenderer * renderer;
+	GtkTreeViewColumn * column;
+
+	memset(&helper, 0, sizeof(helper));
+	helper.type = PANEL_APPLET_TYPE_NORMAL;
+	helper.icon_size = GTK_ICON_SIZE_MENU;
+	helper.error = _error;
+	gtk_init(&argc, &argv);
+	if(optind != argc)
+		return _usage();
+	if((wpa = _wpa_init(&helper, &widget)) == NULL)
+		return 2;
+	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size(GTK_WINDOW(window), 200, 300);
+#if GTK_CHECK_VERSION(2, 6, 0)
+	gtk_window_set_icon_name(GTK_WINDOW(window), "network-wireless");
+#endif
+	gtk_window_set_title(GTK_WINDOW(window), "Wireless browser");
+	g_signal_connect_swapped(window, "delete-event", G_CALLBACK(
+				_wifibrowser_on_closex), wpa);
+	widget = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
+			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);
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes("SSID", renderer,
+			"text", 3, NULL);
+	gtk_tree_view_column_set_sort_column_id(column, 3);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes("BSSID", renderer,
+			"text", 0, NULL);
+	gtk_tree_view_column_set_sort_column_id(column, 3);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+	gtk_container_add(GTK_CONTAINER(widget), view);
+	gtk_container_add(GTK_CONTAINER(window), widget);
+	gtk_widget_show_all(window);
+	gtk_main();
+	_wpa_destroy(wpa);
+	return 0;
+}