diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.form
index e66f0f4d3f..2d2f730188 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.form
@@ -212,6 +212,9 @@
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestJobSettingsPanel.jButtonSelectAll.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
+        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
+          <Insets value="[2, 8, 2, 8]"/>
+        </Property>
         <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[87, 23]"/>
         </Property>
@@ -231,6 +234,9 @@
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestJobSettingsPanel.jButtonDeselectAll.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
+        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
+          <Insets value="[2, 8, 2, 8]"/>
+        </Property>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[86, 23]"/>
         </Property>
@@ -244,6 +250,9 @@
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestJobSettingsPanel.pastJobsButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
+        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
+          <Insets value="[2, 8, 2, 8]"/>
+        </Property>
         <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[87, 23]"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.java
index ac045ea63b..2326213fe1 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.java
@@ -288,6 +288,7 @@ public final class IngestJobSettingsPanel extends javax.swing.JPanel {
         );
 
         jButtonSelectAll.setText(org.openide.util.NbBundle.getMessage(IngestJobSettingsPanel.class, "IngestJobSettingsPanel.jButtonSelectAll.text")); // NOI18N
+        jButtonSelectAll.setMargin(new java.awt.Insets(2, 8, 2, 8));
         jButtonSelectAll.setMaximumSize(new java.awt.Dimension(87, 23));
         jButtonSelectAll.setMinimumSize(new java.awt.Dimension(87, 23));
         jButtonSelectAll.setPreferredSize(new java.awt.Dimension(86, 23));
@@ -298,6 +299,7 @@ public final class IngestJobSettingsPanel extends javax.swing.JPanel {
         });
 
         jButtonDeselectAll.setText(org.openide.util.NbBundle.getMessage(IngestJobSettingsPanel.class, "IngestJobSettingsPanel.jButtonDeselectAll.text")); // NOI18N
+        jButtonDeselectAll.setMargin(new java.awt.Insets(2, 8, 2, 8));
         jButtonDeselectAll.setPreferredSize(new java.awt.Dimension(86, 23));
         jButtonDeselectAll.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -306,6 +308,7 @@ public final class IngestJobSettingsPanel extends javax.swing.JPanel {
         });
 
         pastJobsButton.setText(org.openide.util.NbBundle.getMessage(IngestJobSettingsPanel.class, "IngestJobSettingsPanel.pastJobsButton.text")); // NOI18N
+        pastJobsButton.setMargin(new java.awt.Insets(2, 8, 2, 8));
         pastJobsButton.setMaximumSize(new java.awt.Dimension(87, 23));
         pastJobsButton.setMinimumSize(new java.awt.Dimension(87, 23));
         pastJobsButton.setPreferredSize(new java.awt.Dimension(87, 23));
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form
index bb7e45eb77..b1df3cea4e 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form
+++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form
@@ -28,15 +28,15 @@
                           <Component id="profileDescLabel" min="-2" max="-2" attributes="0"/>
                           <Component id="profileNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace pref="366" max="32767" attributes="0"/>
+                      <EmptySpace pref="478" max="32767" attributes="0"/>
                   </Group>
               </Group>
           </Group>
           <Group type="102" alignment="1" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="1" attributes="0">
-                  <Component id="profileDescPane" alignment="0" max="32767" attributes="0"/>
-                  <Component id="profileNameField" alignment="1" max="32767" attributes="0"/>
+                  <Component id="jScrollPane1" alignment="0" max="32767" attributes="0"/>
+                  <Component id="profileDescPane" alignment="1" max="32767" attributes="0"/>
               </Group>
               <EmptySpace min="6" pref="6" max="-2" attributes="0"/>
           </Group>
@@ -47,9 +47,9 @@
           <Group type="102" alignment="1" attributes="0">
               <EmptySpace min="-2" max="-2" attributes="0"/>
               <Component id="profileNameLabel" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
-              <Component id="profileNameField" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jScrollPane1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
               <Component id="profileDescLabel" min="-2" pref="22" max="-2" attributes="0"/>
               <EmptySpace min="-2" max="-2" attributes="0"/>
               <Component id="profileDescPane" max="32767" attributes="0"/>
@@ -75,11 +75,9 @@
             <Property name="rows" type="int" value="5"/>
             <Property name="wrapStyleWord" type="boolean" value="true"/>
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[10, 22]"/>
-            </Property>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[14, 40]"/>
+              <Dimension value="[104, 22]"/>
             </Property>
+            <Property name="name" type="java.lang.String" value="" noResource="true"/>
           </Properties>
         </Component>
       </SubComponents>
@@ -98,11 +96,17 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="profileNameField">
-    </Component>
     <Container class="javax.swing.JPanel" name="jPanel1">
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
     </Container>
+    <Container class="javax.swing.JScrollPane" name="jScrollPane1">
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+      <SubComponents>
+        <Component class="javax.swing.JTextField" name="profileNameField">
+        </Component>
+      </SubComponents>
+    </Container>
   </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java
index b9e48b1043..7120fddf81 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java
@@ -100,15 +100,16 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel {
         profileDescArea = new javax.swing.JTextArea();
         profileDescLabel = new javax.swing.JLabel();
         profileNameLabel = new javax.swing.JLabel();
-        profileNameField = new javax.swing.JTextField();
         jPanel1 = new javax.swing.JPanel();
+        jScrollPane1 = new javax.swing.JScrollPane();
+        profileNameField = new javax.swing.JTextField();
 
         profileDescArea.setColumns(20);
         profileDescArea.setLineWrap(true);
         profileDescArea.setRows(5);
         profileDescArea.setWrapStyleWord(true);
-        profileDescArea.setMinimumSize(new java.awt.Dimension(10, 22));
-        profileDescArea.setPreferredSize(new java.awt.Dimension(14, 40));
+        profileDescArea.setMinimumSize(new java.awt.Dimension(104, 22));
+        profileDescArea.setName(""); // NOI18N
         profileDescPane.setViewportView(profileDescArea);
 
         org.openide.awt.Mnemonics.setLocalizedText(profileDescLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileDescLabel.text")); // NOI18N
@@ -117,6 +118,8 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel {
 
         jPanel1.setLayout(new java.awt.BorderLayout());
 
+        jScrollPane1.setViewportView(profileNameField);
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -131,12 +134,12 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel {
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(profileDescLabel)
                             .addComponent(profileNameLabel))
-                        .addContainerGap(366, Short.MAX_VALUE))))
+                        .addContainerGap(478, Short.MAX_VALUE))))
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(profileDescPane, javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(profileNameField))
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(profileDescPane))
                 .addGap(6, 6, 6))
         );
         layout.setVerticalGroup(
@@ -145,8 +148,8 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel {
                 .addContainerGap()
                 .addComponent(profileNameLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(profileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGap(4, 4, 4)
                 .addComponent(profileDescLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(profileDescPane)
@@ -166,6 +169,7 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel {
     }
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JPanel jPanel1;
+    private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JTextArea profileDescArea;
     private javax.swing.JLabel profileDescLabel;
     private javax.swing.JScrollPane profileDescPane;