diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/SelectBlockDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/SelectBlockDialog.java
index d27ae59515..facfedc7ea 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/SelectBlockDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/SelectBlockDialog.java
@@ -15,12 +15,20 @@
  */
 package ghidra.app.plugin.core.select;
 
-import java.awt.*;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.math.BigInteger;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
 
 import docking.ComponentProvider;
 import docking.DialogComponentProvider;
@@ -30,9 +38,19 @@ import docking.widgets.textfield.IntegerTextField;
 import ghidra.app.nav.Navigatable;
 import ghidra.app.nav.NavigationUtils;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.program.model.address.*;
+import ghidra.program.model.address.Address;
+import ghidra.program.model.address.AddressFactory;
+import ghidra.program.model.address.AddressFormatException;
+import ghidra.program.model.address.AddressOutOfBoundsException;
+import ghidra.program.model.address.AddressRange;
+import ghidra.program.model.address.AddressRangeIterator;
+import ghidra.program.model.address.AddressSet;
+import ghidra.program.model.address.AddressSetView;
+import ghidra.program.model.address.AddressSpace;
+import ghidra.program.model.address.OverlayAddressSpace;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
+import ghidra.util.layout.PairLayout;
 
 /**
  * Class to set up dialog box that will enable the user
@@ -86,25 +104,18 @@ class SelectBlockDialog extends DialogComponentProvider {
 	private JPanel buildBlockPanel() {
 		JPanel main = new JPanel();
 		main.setBorder(BorderFactory.createTitledBorder("Byte Selection"));
-		main.setLayout(new GridBagLayout());
-		GridBagConstraints gbc = new GridBagConstraints();
-		gbc.insets = new Insets(2, 2, 2, 2);
-		gbc.anchor = GridBagConstraints.WEST;
-		gbc.gridx = 0;
-		gbc.gridy = 0;
+		
+		main.setLayout(new PairLayout());
 
-		main.add(new GLabel("Ending Address:"), gbc);
-		gbc.gridx++;
+		main.add(new GLabel("Ending Address:"));
 		toAddressField = new JTextField(10);
-		main.add(toAddressField, gbc);
-		gbc.gridx = 0;
-		gbc.gridy++;
-		main.add(new GLabel("Length: "), gbc);
-		gbc.gridx++;
+		main.add(toAddressField);
+
+		main.add(new GLabel("Length: "));
 		numberInputField = new IntegerTextField(10);
 		numberInputField.setMaxValue(BigInteger.valueOf(Integer.MAX_VALUE));
 		numberInputField.setAllowNegativeValues(false);
-		main.add(numberInputField.getComponent(), gbc);
+		main.add(numberInputField.getComponent());
 		return main;
 	}