diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/DatePicker.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/DatePicker.java
index 1cbcc94..53709ab 100644
--- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/DatePicker.java	
+++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/DatePicker.java	
@@ -87,7 +87,7 @@ public class DatePicker extends JFrame implements ActionListener {
 			mListener.onDatePicked(mResultCode, new Date("\""+
 					mCalendar.getYearChooser().getYear()+"-"+ (mCalendar.getMonthChooser().getMonth()+1) +"-"+ mCalendar.getDayChooser().getDay() +
 					" "+ Integer.parseInt(mHours.getText())+":"+ Integer.parseInt(mMinutes.getText())+":"+ Integer.parseInt(mSeconds.getText())+"\""));
-			this.setVisible(false);
+			this.dispose();
 		} catch (NumberFormatException e1) {
 			e1.printStackTrace();
 			mFailLabel.setVisible(true);
diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java
index e771c5f..05a2c68 100644
--- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java	
+++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java	
@@ -49,6 +49,7 @@ public class MainWindow extends JFrame implements ActionListener, ProgressListen
 	public MainWindow() {
 		
 		Thread.setDefaultUncaughtExceptionHandler(mExceptionReport);
+		this.setDefaultCloseOperation(EXIT_ON_CLOSE);
 		
 		setTitle("Twenty Codes, LLC Order Database");
 		JPanel panel = new JPanel();
diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllDialog.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllDialog.java
index d3b8ff0..8fe4f32 100644
--- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllDialog.java	
+++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllDialog.java	
@@ -100,7 +100,7 @@ public class ShowAllDialog extends JFrame implements ActionListener, ProgressLis
 
 	@Override
 	public void actionPerformed(ActionEvent arg0) {
-		setVisible(false);		
+		this.dispose();	
 	}
 
 	@Override