diff --git a/src/com/sheepit/client/standalone/GuiSwing.java b/src/com/sheepit/client/standalone/GuiSwing.java
index 6fdaaaf..6e71a80 100644
--- a/src/com/sheepit/client/standalone/GuiSwing.java
+++ b/src/com/sheepit/client/standalone/GuiSwing.java
@@ -20,6 +20,7 @@
 package com.sheepit.client.standalone;
 
 import java.awt.AWTException;
+import java.awt.Container;
 import java.awt.GridBagLayout;
 import java.awt.Image;
 import java.awt.MenuItem;
@@ -38,6 +39,7 @@ import java.util.TimerTask;
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
@@ -58,6 +60,7 @@ public class GuiSwing extends JFrame implements Gui {
 	
 	private SystemTray sysTray;
 	private JPanel panel;
+	private JScrollPane scrollPane;
 	private Working activityWorking;
 	private Settings activitySettings;
 	private TrayIcon trayIcon;
@@ -127,7 +130,8 @@ public class GuiSwing extends JFrame implements Gui {
 		
 		panel = new JPanel();
 		panel.setLayout(new GridBagLayout());
-		setContentPane(this.panel);
+		scrollPane = new JScrollPane(panel);
+		setContentPane(this.scrollPane);
 		panel.setBorder(new EmptyBorder(20, 20, 20, 20));
 		
 		activityWorking = new Working(this);
@@ -334,6 +338,11 @@ public class GuiSwing extends JFrame implements Gui {
 		
 	}
 	
+	@Override
+	public Container getContentPane() {
+		return panel;
+	}
+
 	public class ThreadClient extends Thread {
 		@Override
 		public void run() {