diff --git a/html/gui/js/modules/job_viewer/JobViewer.js b/html/gui/js/modules/job_viewer/JobViewer.js
index ae1c60239d..3f0c70ced7 100644
--- a/html/gui/js/modules/job_viewer/JobViewer.js
+++ b/html/gui/js/modules/job_viewer/JobViewer.js
@@ -216,7 +216,9 @@ XDMoD.Module.JobViewer = Ext.extend(XDMoD.PortalModule, {
modal: true,
title: 'Search',
layout: 'fit',
- resizable: false,
+ resizable: true,
+ boxMaxHeight: 641,
+ boxMaxWidth: 1014,
items: [searchPanel]
});
searchPanel.relayEvents(self.searchWindow, ['show', 'hide', 'move']);
diff --git a/html/gui/js/modules/job_viewer/SearchPanel.js b/html/gui/js/modules/job_viewer/SearchPanel.js
index 1f51af81ac..01231958bd 100644
--- a/html/gui/js/modules/job_viewer/SearchPanel.js
+++ b/html/gui/js/modules/job_viewer/SearchPanel.js
@@ -65,6 +65,7 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, {
Ext.apply(this, {
layout: 'table',
width: 1000,
+ autoScroll: true,
border: false,
layoutConfig: {
columns: 2