diff --git a/src/layout_edit.cpp b/src/layout_edit.cpp
index 2e13b8d..aae34fe 100644
--- a/src/layout_edit.cpp
+++ b/src/layout_edit.cpp
@@ -95,9 +95,12 @@ LayoutEdit::LayoutEdit( LayoutManager* l )
     mainLayout->addWidget( joyButtons );
     
     //we have a WidgetStack to represent the multiple joypads
+    padScroll = new QScrollArea(this);
+    padScroll->setWidgetResizable(true);
+    mainLayout->addWidget(padScroll);
     padStack = new QStackedWidget( this );
     padStack->setFrameStyle(QFrame::Box | QFrame::Sunken );
-    mainLayout->addWidget(padStack);
+    padScroll->setWidget(padStack);
 
     //go through each of the available joysticks
     // i is the current index into PadStack
diff --git a/src/layout_edit.h b/src/layout_edit.h
index 7450877..e3b37fb 100644
--- a/src/layout_edit.h
+++ b/src/layout_edit.h
@@ -1,6 +1,7 @@
 #ifndef QJOYPAD_LAYOUT_EDIT_H
 #define QJOYPAD_LAYOUT_EDIT_H
 
+#include <QScrollArea>
 #include <QStackedWidget>
 
 //for the tab list of joypads
@@ -33,6 +34,7 @@ class LayoutEdit : public QWidget {
         LayoutManager* lm;
 		//parts of the dialog:
         QVBoxLayout *mainLayout;
+        QScrollArea *padScroll;
         QStackedWidget *padStack;
         FlashRadioArray *joyButtons;
         QComboBox* cmbLayouts;