diff --git a/src/prefs/dun/DUN.cpp b/src/prefs/dun/DUN.cpp
index b834be04a8..5f18a50489 100644
--- a/src/prefs/dun/DUN.cpp
+++ b/src/prefs/dun/DUN.cpp
@@ -44,8 +44,7 @@ const uint32 MENU_CON_NEW = 'MCNu';
 
 // DUN -- constructor for DUN Class
 DUN::DUN() : BApplication (APP_SIGNATURE) {
-   new DUNWindow(windowRect);
-   
+   dunWindow = new DUNWindow(windowRect);
 }
 // ------------------------------------------------------------------------------- //
 
diff --git a/src/prefs/dun/DUN.h b/src/prefs/dun/DUN.h
index c0960db94d..b484848f2d 100644
--- a/src/prefs/dun/DUN.h
+++ b/src/prefs/dun/DUN.h
@@ -9,6 +9,8 @@ DUN Header by Sikosis (beos@gravity24hr.com)
 #ifndef __DUN_H__
 #define __DUN_H__
 
+#include "DUNWindow.h"
+
 extern const char *APP_SIGNATURE;
 
 class DUN : public BApplication {
@@ -16,6 +18,7 @@ public:
    DUN();
    virtual void MessageReceived(BMessage *message);
 private:
+	DUNWindow* dunWindow;
 };
 
 #endif
diff --git a/src/prefs/dun/DUNWindow.cpp b/src/prefs/dun/DUNWindow.cpp
index fbcebd076a..2648bf1953 100644
--- a/src/prefs/dun/DUNWindow.cpp
+++ b/src/prefs/dun/DUNWindow.cpp
@@ -261,7 +261,7 @@ bool DUNWindow::QuitRequested() {
 void DUNWindow::MessageReceived (BMessage *message) {
    switch(message->what) {
    	   case BTN_MODEM:
-  	   	 new ModemWindow(windowRectModem);
+  	   	 modemWindow = new ModemWindow(windowRectModem);
   	   	 break;	
        default:
          BWindow::MessageReceived(message);
diff --git a/src/prefs/dun/DUNWindow.h b/src/prefs/dun/DUNWindow.h
index e472ddc045..1aa110e2c4 100644
--- a/src/prefs/dun/DUNWindow.h
+++ b/src/prefs/dun/DUNWindow.h
@@ -9,6 +9,8 @@ DUNWindow Header by Sikosis (beos@gravity24hr.com)
 #ifndef __DUNWINDOW_H__
 #define __DUNWINDOW_H__
 
+#include "ModemWindow.h"
+
 class DUNView; 
 
 class DUNWindow : public BWindow {
@@ -18,35 +20,37 @@ public:
    virtual bool QuitRequested();
    virtual void MessageReceived(BMessage *message);
 private:
-   void InitWindow(void);
-   DUNView* aDUNview;
+	ModemWindow *modemWindow;
+    void InitWindow(void);
+    DUNView* aDUNview;
+    
+    //BMenuBar *menubar;
+    BBox *topframe;
+    BBox *middleframe;
+    BBox *bottomframe;
    
-   //BMenuBar *menubar;
-   BBox *topframe;
-   BBox *middleframe;
-   BBox *bottomframe;
+    BButton *modembutton;
+    BButton *disconnectbutton;
+    BButton *connectbutton;
    
-   BButton *modembutton;
-   BButton *disconnectbutton;
-   BButton *connectbutton;
+    BCheckBox *disablecallwaiting;
+    BCheckBox *dialoutprefix;
    
-   BCheckBox *disablecallwaiting;
-   BCheckBox *dialoutprefix;
+    BOutlineListView *connectionlistitem;
+    BOutlineListView *locationlistitem;
    
-   BOutlineListView *connectionlistitem;
-   BOutlineListView *locationlistitem;
+    BMenuField *connectionmenufield;
+    BMenuField *locationmenufield;
    
-   BMenuField *connectionmenufield;
-   BMenuField *locationmenufield;
-   BMenu *conmenufield;
-   BMenu *locmenufield;
+    BMenu *conmenufield;
+    BMenu *locmenufield;
    
-   BTextView *tvConnectionProfile;
-   BTextView *tvCallWaiting;
-   BTextView *tvConnection;
-   BTextView *tvTimeOnline;
-   BTextView *tvLIP;
-   BTextView *tvLocalIPAddress;
+    BTextView *tvConnectionProfile;
+    BTextView *tvCallWaiting;
+    BTextView *tvConnection;
+    BTextView *tvTimeOnline;
+    BTextView *tvLIP;
+    BTextView *tvLocalIPAddress;
    
 };
 
diff --git a/src/prefs/dun/ModemWindow.h b/src/prefs/dun/ModemWindow.h
index 55c0ce69f7..37742470a4 100644
--- a/src/prefs/dun/ModemWindow.h
+++ b/src/prefs/dun/ModemWindow.h
@@ -9,6 +9,8 @@ ModemWindow Header by Sikosis (beos@gravity24hr.com)
 #ifndef __MODEMWINDOW_H__
 #define __MODEMWINDOW_H__
 
+#include "ModemWindow.h"
+
 class ModemView; 
 
 class ModemWindow : public BWindow
@@ -18,32 +20,32 @@ public:
    ~ModemWindow();
    virtual void MessageReceived(BMessage *message);
 private:
-   void InitWindow(void);
-   ModemView* aModemview;
+	void InitWindow(void);
+	ModemView* aModemview;
    
-   BButton *btnModemWindowCustom;
-   BButton *btnModemWindowCancel;
-   BButton *btnModemWindowDone;
+    BButton *btnModemWindowCustom;
+    BButton *btnModemWindowCancel;
+    BButton *btnModemWindowDone;
    
-   BMenu *YourModemIsMenu;
-   BMenuField *YourModemIsMenuField;
-   BMenu *ConnectViaMenu;
-   BMenuField *ConnectViaMenuField;
-   BMenu *SpeedMenu;
-   BMenuField *SpeedMenuField;
+    BMenu *YourModemIsMenu;
+    BMenuField *YourModemIsMenuField;
+    BMenu *ConnectViaMenu;
+    BMenuField *ConnectViaMenuField;
+    BMenu *SpeedMenu;
+    BMenuField *SpeedMenuField;
    
-   BTextView *tvRedial;
-   BTextView *tvTimesBusySignal;
-   BTextView *tvUse;
-   BTextView *tvReadLogPath;
-   BTextView *tvWriteLogPath;
+    BTextView *tvRedial;
+    BTextView *tvTimesBusySignal;
+    BTextView *tvUse;
+    BTextView *tvReadLogPath;
+    BTextView *tvWriteLogPath;
    
-   BCheckBox *chkMakeConnection;
-   BCheckBox *chkShowTerminal;
-   BCheckBox *chkLogAll;
+    BCheckBox *chkMakeConnection;
+    BCheckBox *chkShowTerminal;
+    BCheckBox *chkLogAll;
    
-   BRadioButton *rbTone;
-   BRadioButton *rbPulse;
+    BRadioButton *rbTone;
+    BRadioButton *rbPulse;
 };
 
 #endif