diff --git a/lang/en_us.php b/lang/en_us.php
index 689e543..3961bee 100644
--- a/lang/en_us.php
+++ b/lang/en_us.php
@@ -117,6 +117,7 @@ define("STRINGS", [
     "permissions assigned" => "Permissions assigned.",
     "type to select a user" => "Type to select a user",
     "type to add a permission" => "Type to add a permission",
+    "Choose a permission" => "Choose a permission",
     "select a user to view or edit permissions" => "Select a user to view or edit the assigned permissions.",
     "group" => "Group",
     "groups" => "Groups",
diff --git a/pages/permissions.php b/pages/permissions.php
index 93deeb8..63032de 100644
--- a/pages/permissions.php
+++ b/pages/permissions.php
@@ -50,7 +50,27 @@ if ($VARS['user'] && $database->has('accounts', ['username' => $VARS['user']]))
                         <div class="form-group">
                             <label for="perms-box"><i class="fas fa-key"></i> <?php lang("permissions"); ?></label><br />
                             <div class="input-group">
-                                <input type="text" id="perms-box" class="form-control" placeholder="<?php lang("type to add a permission") ?>" />
+                                <?php
+                                if ($database->count('permissions') > 30) {
+                                    ?>
+                                    <input type="text" id="perms-box" class="form-control" placeholder="<?php lang("type to add a permission") ?>" />
+                                    <?php
+                                } else {
+                                    ?>
+                                    <select id="perms-box" class="form-control">
+                                        <option><?php lang("Choose a permission") ?></option>
+                                        <?php
+                                        $allpermissions = $database->select('permissions', ['permid', 'permcode', 'perminfo']);
+                                        foreach ($allpermissions as $p) {
+                                            if (!in_array($p, $perms)) {
+                                                echo "<option value=\"$p[permcode]\">$p[permcode]: $p[perminfo]</option>";
+                                            }
+                                        }
+                                        ?>
+                                    </select>
+                                    <?php
+                                }
+                                ?>
                                 <div class="input-group-append">
                                     <button class="btn btn-default" type="button" id="addpermbtn"><i class="fa fa-plus"></i> <?php lang("add") ?></button>
                                 </div>