diff --git a/src/preferences/network/NetworkWindow.cpp b/src/preferences/network/NetworkWindow.cpp
index 63d01b0288..fd33f987e4 100644
--- a/src/preferences/network/NetworkWindow.cpp
+++ b/src/preferences/network/NetworkWindow.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright 2004-2008 Haiku Inc. All rights reserved.
+ * Copyright 2004-2010 Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Author:
  *		Andre Alves Garzia, andre@andregarzia.com
  */
 
+
 #include "NetworkWindow.h"
 
 #include <Application.h>
@@ -15,39 +16,17 @@
 
 #include "EthernetSettingsView.h"
 
+
 #undef B_TRANSLATE_CONTEXT
 #define B_TRANSLATE_CONTEXT "NetworkWindow"
 
+
 NetworkWindow::NetworkWindow()
-	: BWindow(BRect(50, 50, 269, 302), B_TRANSLATE("Network"), B_TITLED_WINDOW,
+	:
+	BWindow(BRect(50, 50, 269, 302), B_TRANSLATE("Network"), B_TITLED_WINDOW,
 		B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
-		| B_AUTO_UPDATE_SIZE_LIMITS)
+		| B_AUTO_UPDATE_SIZE_LIMITS | B_QUIT_ON_WINDOW_CLOSE)
 {
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
-	fEthernetView = new EthernetSettingsView();
-	GetLayout()->AddView(fEthernetView);
-}
-
-
-NetworkWindow::~NetworkWindow()
-{
-}
-
-
-void
-NetworkWindow::MessageReceived(BMessage* message)
-{
-	switch (message->what) {
-		default:
-			BWindow::MessageReceived(message);
-	}
-
-}
-
-
-bool
-NetworkWindow::QuitRequested()
-{
-	be_app->PostMessage(B_QUIT_REQUESTED);
-	return true;
+	GetLayout()->AddView(new EthernetSettingsView());
 }
diff --git a/src/preferences/network/NetworkWindow.h b/src/preferences/network/NetworkWindow.h
index 16f29e3885..686d48a868 100644
--- a/src/preferences/network/NetworkWindow.h
+++ b/src/preferences/network/NetworkWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Haiku Inc. All rights reserved.
+ * Copyright 2004-2010 Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Author:
@@ -11,18 +11,11 @@
 
 #include <Window.h>
 
-#include "EthernetSettingsView.h"
-
 
 class NetworkWindow : public BWindow {
 public:
-					NetworkWindow();
-	virtual			~NetworkWindow();
-	virtual bool	QuitRequested();
-	virtual void	MessageReceived(BMessage* mesage);
-
-private:
-	EthernetSettingsView* fEthernetView;
+								NetworkWindow();
 };
 
-#endif	/* NETWORK_WINDOW_H */
+
+#endif	// NETWORK_WINDOW_H